1 files changed, 6 insertions, 8 deletions
diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx
index 963a7fb46568..6e70b78d2eea 100644
--- a/fpicker/source/office/commonpicker.cxx
+++ b/fpicker/source/office/commonpicker.cxx
@@ -99,12 +99,12 @@ namespace svt
 
     void OCommonPicker::prepareDialog()
     {
-        if ( !getDialog() )
-            createPicker();
-
-        // set the title
-        if ( !m_aTitle.isEmpty() )
-            getDialog()->SetText( m_aTitle );
+        if(createPicker())
+        {
+            // set the title
+            if ( !m_aTitle.isEmpty() )
+                m_pDlg->SetText( m_aTitle );
+        }
     }
 
 
@@ -199,8 +199,6 @@ namespace svt
 
     bool OCommonPicker::createPicker()
     {
-        SolarMutexGuard aGuard;
-
         if ( !m_pDlg )
         {
             m_pDlg = implCreateDialog( VCLUnoHelper::GetWindow( m_xDialogParent ) );