Merge branch 'aoo'

Author: KlausBlum

extension/OOoLilyPond/LilyPond.xba

@@ -190,7 +190,8 @@ End Sub
 Function DeleteTempFilesOfType (sFileType As String) As Integer  ' 0: success, 1: error
 	Dim sDirEntry As String
 	Dim sCurrentFile As String
-	
+
+	On Error GoTo ErrorHandler
 	sDirEntry = Dir (sTmpPath & constOLyFileName & "*." & sFileType)
 	Do While sDirEntry <> ""
 		' If oFileAccess.exists (sTmpPath & sDirEntry) Then 
@@ -230,11 +231,11 @@ Sub CleanUpAfterwards()
 	Exit Sub
 
 	ErrorHandler:
-		' If Err <> 1 Then
+		If Err <> 1 Then
 			MsgBox (Err & Chr(10) & Error, iMsgBox_E, oMessages.getPropertyValue ("sCaptionError"))
-		' Else	' Error 1: "A file or directory could not be deleted"
+		Else	' Error 1: "A file or directory could not be deleted"
 			' Nothing. This can happen in old-fashioned OpenOffice if you use the "direct" method to insert images. Apparently, it works anyway, don't know why... 
-		' End If
+		End If
 	Resume Next
 End Sub
 

extension/OOoLilyPond/OOoLilyPond.xba

@@ -768,6 +768,14 @@ Sub InsertOOoLilyPondObjectViaClipboard (sIdentifier As String, sNumber As Strin
 		oGraphic.TopMargin = 0
 		oGraphic.BottomMargin = 0
 		oGraphic.VertOrient = 0
+		oGraphic.HoriOrient = com.sun.star.text.HoriOrientation.NONE
+		if iAnchor = com.sun.star.text.TextContentAnchorType.AT_CHARACTER Then
+			oGraphic.HoriOrientRelation = com.sun.star.text.RelOrientation.CHAR
+			oGraphic.VertOrientRelation = com.sun.star.text.RelOrientation.CHAR
+		Else
+			oGraphic.HoriOrientRelation = com.sun.star.text.RelOrientation.PRINT_AREA
+			oGraphic.HoriOrientRelation = com.sun.star.text.RelOrientation.PRINT_AREA
+		End If
 
 		if bShapeIsSelected And (iAnchor = iOriginalAnchor) And Not IsNull (oShapePosition) Then oGraphic.position = oShapePosition
 
@@ -824,10 +832,15 @@ Sub InsertOOoLilyPondObject (sIdentifier As String, sNumber As String, sAddition
 			Else ' should never be the case
 				oGraphic = ImportBitmapIntoWriter (ConvertToURL (sTmpPath & constOLyFileName & sNumber & sAddition & "." & sExtension), oCurrentGraphicObject(0), true)
 			End If
+			oGraphic.VertOrient = 0
 			if bShapeIsSelected And (iAnchor = iOriginalAnchor) And Not IsNull (oShapePosition) Then
 				oGraphic.HoriOrientPosition = oShapePosition.X
 				oGraphic.VertOrientPosition = oShapePosition.Y
-				oGraphic.AnchorPageNo = iAnchorPageNo
+				If iAnchor = 2 Then  ' AT_PAGE
+					oGraphic.AnchorPageNo = iAnchorPageNo
+					' OpenOffice was crashed by this when iAnchor was AS_CHARACTER
+					' No problem with LibreOffice
+				End If
 			End If		
 
 		Case "SwXTextGraphicObject" ' Graphic is selected in Writer
@@ -841,9 +854,11 @@ Sub InsertOOoLilyPondObject (sIdentifier As String, sNumber As String, sAddition
 					oGraphic = ImportBitmapIntoWriter (ConvertToURL (sTmpPath & constOLyFileName & sNumber & sAddition & "." & sExtension), oCurrentGraphicObject, true)
 				End If
 			End If
+			oGraphic.VertOrient = 0
 
 		Case "SwXTextRanges" ' Nothing or normal text selection in Writer
 			oGraphic = ImportBitmapIntoWriter (ConvertToURL (sTmpPath & constOLyFileName & sNumber & sAddition & "." & sExtension), oCurrentCursor, false)
+			oGraphic.VertOrient = 0
 
 		End Select
 
@@ -853,7 +868,14 @@ Sub InsertOOoLilyPondObject (sIdentifier As String, sNumber As String, sAddition
 
 		oGraphic.TopMargin = 0
 		oGraphic.BottomMargin = 0
-		oGraphic.VertOrient = 0
+		oGraphic.HoriOrient = com.sun.star.text.HoriOrientation.NONE
+		if iAnchor = com.sun.star.text.TextContentAnchorType.AT_CHARACTER Then
+			oGraphic.HoriOrientRelation = com.sun.star.text.RelOrientation.CHAR
+			oGraphic.VertOrientRelation = com.sun.star.text.RelOrientation.CHAR
+		Else
+			oGraphic.HoriOrientRelation = com.sun.star.text.RelOrientation.PRINT_AREA
+			oGraphic.HoriOrientRelation = com.sun.star.text.RelOrientation.PRINT_AREA
+		End If
 
 	Else 'We are in Impress or Draw