Merge branch 'fix_multiple_insertion'

Author: KlausBlum

extension/OOoLilyPond/OOoLilyPond.xba

@@ -36,7 +36,6 @@ Sub OOoLilyPond()
 	Dim oDoc As Object
 	Dim oDocCtrl As Object
 	Dim bWrongDocumentType As Boolean
-	Dim oShape As Object
 
 	oMessages  = CreateUnoService ("com.sun.star.beans.PropertyBag")
 
@@ -123,6 +122,26 @@ Sub OOoLilyPond()
 	bUseDefaultCustom1 = True
 	bUseDefaultCustom2 = True
 
+	If Not ReadSelectionObject () Then Exit Sub   ' create Cursor and read Attributes if Object is selected
+
+	' Now we know which template to use
+	ReadTemplate()
+
+	' Open the dialog box
+	EditorDialog()
+End Sub
+
+
+Function ReadSelectionObject () As Boolean
+
+	Dim oDoc As Object
+	Dim oDocCtrl As Object
+	Dim oShape As Object
+	
+	' Get the current document and controller
+ 	oDoc = ThisComponent
+	oDocCtrl = oDoc.getCurrentController()
+
 	' create Cursor and read Attributes if Object is selected
 	If Not IsEmpty(oDocCtrl.getSelection) Then ' Is only empty in Impress or Draw when nothing is selected
 		oSelection=oDocCtrl.getSelection
@@ -134,16 +153,25 @@ Sub OOoLilyPond()
 			oShape = oSelection.getByIndex(0)
 			If bInWriter Then ' OLy < 0.4 in Writer
 				' oCursor = oDoc.Text.createTextCursorByRange(oSelection(0).getAnchor())
-				If Not ReadAttributes(oShape) Then Exit Sub 'Read the OLy fields from the Object Attributes
+				If Not ReadAttributes(oShape) Then  'Read the OLy fields from the Object Attributes
+					ReadSelectionObject = False
+					Exit Function
+				End If
 				' oSelection(0).getParent().remove(oSelection(0)) ' Delete old OLyObject
 			Else ' OLy object in Draw / Impress
-				If Not ReadAttributes(oShape) Then Exit Sub 'Read the OLy fields from the Object Attributes
+				If Not ReadAttributes(oShape) Then  'Read the OLy fields from the Object Attributes
+					ReadSelectionObject = False
+					Exit Function
+				End If
 			End If
 			oShapePosition = oShape.position()
 			bShapeIsSelected = True
 
 		Case "SwXTextGraphicObject" ' Graphic is selected in Writer
-			If Not ReadAttributes(oSelection) Then Exit Sub ' Read the OLy fields from the Object Attributes
+			If Not ReadAttributes(oSelection) Then ' Read the OLy fields from the Object Attributes
+				ReadSelectionObject = False
+				Exit Function
+			End If
 			bShapeIsSelected = True
 
 		Case "SwXTextRanges" ' Nothing or normal text selection in Writer
@@ -152,18 +180,13 @@ Sub OOoLilyPond()
 		Case Else
 			' Msgbox ("The selected object is not an OLy object ...", 0, "Error")
 			Msgbox (oMessages.getPropertyValue ("sMsgNoOlyObject"), iMsgBox_E, oMessages.getPropertyValue ("sCaptionError"))
-			Exit Sub
+			ReadSelectionObject = False
+			Exit Function
 
 		End Select
 	End If
-
-
-	' Now we know which template to use
-	ReadTemplate()
-
-	' Open the dialog box
-	EditorDialog()
-End Sub
+	ReadSelectionObject = True
+End Function
 
 
 sub Make()
@@ -242,6 +265,7 @@ sub Make()
 
  	'If there were errors or warnings
  	If iNErr >= 1 And Not bIgnoreWarnings Then
+ 		ReadSelectionObject ()
  	 	iErrNum = 1
   		DisplayError()
   		Exit Sub