CWS-TOOLING: integrate CWS cmcfixes50

2008-11-10 13:31:50 +0100 cmc  r263517 : gio doesn't do anything useful for remote stuff wrt info
2008-11-06 00:11:47 +0100 cmc  r263359 : #i93436# pile of other 64bit new gcc warnings
2008-11-05 00:39:03 +0100 cmc  r263340 : i95856 let a ppc64 vanilla build succeed
2008-11-04 14:00:25 +0100 cmc  r263320 : #i93436# useless const
2008-11-04 11:53:10 +0100 cmc  r263314 : #i93436# ambiguous
2008-11-04 11:48:05 +0100 cmc  r263313 : #i93436# add some braces
2008-11-04 11:29:24 +0100 cmc  r263312 : #i93436# ambiguous
2008-11-04 10:53:46 +0100 cmc  r263311 : 

11 files changed, 61 insertions, 59 deletions

diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index 759d9fb810..45e1e23d55 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -462,7 +462,7 @@ long SfxViewFrame::DdeSetData
 BOOL SfxApplication::InitializeDde()
 {
     DBG_ASSERT( !pAppData_Impl->pDdeService,
-                "Dde kann nicht mehrfach initialisiert werden" )
+                "Dde kann nicht mehrfach initialisiert werden" );
 
     pAppData_Impl->pDdeService = new ImplDdeService( Application::GetAppName() );
     int nError = pAppData_Impl->pDdeService->GetError();
@@ -498,7 +498,7 @@ void SfxAppData_Impl::DeInitDDE()
 
 void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
 {
-    DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" )
+    DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" );
     //OV: Im Serverbetrieb ist DDE abgeklemmt!
     if( !pAppData_Impl->pDocTopics )
         return;
@@ -530,7 +530,7 @@ void SfxApplication::AddDdeTopic( SfxObjectShell* pSh )
 
 void SfxApplication::RemoveDdeTopic( SfxObjectShell* pSh )
 {
-    DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" )
+    DBG_ASSERT( pAppData_Impl->pDocTopics, "es gibt gar keinen Dde-Service" );
     //OV: Im Serverbetrieb ist DDE abgeklemmt!
     if( !pAppData_Impl->pDocTopics )
         return;
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index cd280a2aaf..d56b707e55 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -503,7 +503,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     Reference< ::com::sun::star::task::XStatusIndicator > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
-                    DBG_ASSERT( bOK, "invalid type for StatusIndicator" )
+                    DBG_ASSERT( bOK, "invalid type for StatusIndicator" );
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_PROGRESS_STATUSBAR_CONTROL, rProp.Value ) );
                 }
@@ -511,7 +511,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     Reference< ::com::sun::star::task::XInteractionHandler > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
-                    DBG_ASSERT( bOK, "invalid type for InteractionHandler" )
+                    DBG_ASSERT( bOK, "invalid type for InteractionHandler" );
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, rProp.Value ) );
                 }
@@ -523,7 +523,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     Reference< XInputStream > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
-                    DBG_ASSERT( bOK, "invalid type for InputStream" )
+                    DBG_ASSERT( bOK, "invalid type for InputStream" );
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_INPUTSTREAM, rProp.Value ) );
                 }
@@ -531,7 +531,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     Reference< XInputStream > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
-                    DBG_ASSERT( bOK, "invalid type for Stream" )
+                    DBG_ASSERT( bOK, "invalid type for Stream" );
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_STREAM, rProp.Value ) );
                 }
@@ -539,7 +539,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     Reference< XContent > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
-                    DBG_ASSERT( bOK, "invalid type for UCBContent" )
+                    DBG_ASSERT( bOK, "invalid type for UCBContent" );
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_CONTENT, rProp.Value ) );
                 }
@@ -547,7 +547,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     Reference< XOutputStream > xVal;
                     sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is());
-                    DBG_ASSERT( bOK, "invalid type for OutputStream" )
+                    DBG_ASSERT( bOK, "invalid type for OutputStream" );
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_OUTPUTSTREAM, rProp.Value ) );
                 }
@@ -555,7 +555,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     Reference< XInputStream > xVal;
                     sal_Bool bOK = (rProp.Value >>= xVal);
-                    DBG_ASSERT( bOK, "invalid type for PostData" )
+                    DBG_ASSERT( bOK, "invalid type for PostData" );
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_POSTDATA, rProp.Value ) );
                 }
@@ -563,7 +563,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     Reference< XFrame > xVal;
                     sal_Bool bOK = (rProp.Value >>= xVal);
-                    DBG_ASSERT( bOK, "invalid type for Frame" )
+                    DBG_ASSERT( bOK, "invalid type for Frame" );
                     if (bOK)
                         rSet.Put( SfxUnoAnyItem( SID_FILLFRAME, rProp.Value ) );
                 }
@@ -571,7 +571,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for AsTemplate" )
+                    DBG_ASSERT( bOK, "invalid type for AsTemplate" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_TEMPLATE, bVal ) );
                 }
@@ -579,7 +579,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for OpenNewView" )
+                    DBG_ASSERT( bOK, "invalid type for OpenNewView" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_OPEN_NEW_VIEW, bVal ) );
                 }
@@ -587,7 +587,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Int16 nVal = -1;
                     sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
-                    DBG_ASSERT( bOK, "invalid type for ViewId" )
+                    DBG_ASSERT( bOK, "invalid type for ViewId" );
                     if (bOK)
                         rSet.Put( SfxUInt16Item( SID_VIEW_ID, nVal ) );
                 }
@@ -595,7 +595,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Int16 nVal = -1;
                     sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
-                    DBG_ASSERT( bOK, "invalid type for PluginMode" )
+                    DBG_ASSERT( bOK, "invalid type for PluginMode" );
                     if (bOK)
                         rSet.Put( SfxUInt16Item( SID_PLUGIN_MODE, nVal ) );
                 }
@@ -603,7 +603,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for ReadOnly" )
+                    DBG_ASSERT( bOK, "invalid type for ReadOnly" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_DOC_READONLY, bVal ) );
                 }
@@ -611,7 +611,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for StartPresentation" )
+                    DBG_ASSERT( bOK, "invalid type for StartPresentation" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, bVal ) );
                 }
@@ -619,7 +619,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for SelectionOnly" )
+                    DBG_ASSERT( bOK, "invalid type for SelectionOnly" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_SELECTION, bVal ) );
                 }
@@ -627,7 +627,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for Hidden" )
+                    DBG_ASSERT( bOK, "invalid type for Hidden" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_HIDDEN, bVal ) );
                 }
@@ -635,7 +635,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for Minimized" )
+                    DBG_ASSERT( bOK, "invalid type for Minimized" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_MINIMIZED, bVal ) );
                 }
@@ -643,7 +643,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for Silent" )
+                    DBG_ASSERT( bOK, "invalid type for Silent" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_SILENT, bVal ) );
                 }
@@ -651,7 +651,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for Preview" )
+                    DBG_ASSERT( bOK, "invalid type for Preview" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_PREVIEW, bVal ) );
                 }
@@ -659,7 +659,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for ViewOnly" )
+                    DBG_ASSERT( bOK, "invalid type for ViewOnly" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_VIEWONLY, bVal ) );
                 }
@@ -667,7 +667,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for ViewOnly" )
+                    DBG_ASSERT( bOK, "invalid type for ViewOnly" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_EDITDOC, !bVal ) );
                 }
@@ -675,7 +675,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for ViewOnly" )
+                    DBG_ASSERT( bOK, "invalid type for ViewOnly" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_FILE_DIALOG, bVal ) );
                 }
@@ -683,7 +683,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for FileName" )
+                    DBG_ASSERT( bOK, "invalid type or value for FileName" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_STANDARD_DIR, sVal ) );
                 }
@@ -691,7 +691,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for FileName" )
+                    DBG_ASSERT( bOK, "invalid type or value for FileName" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_FILE_NAME, sVal ) );
                 }
@@ -699,7 +699,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = (rProp.Value >>= sVal);
-                    DBG_ASSERT( bOK, "invalid type or value for SalvageURL" )
+                    DBG_ASSERT( bOK, "invalid type or value for SalvageURL" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_DOC_SALVAGE, sVal ) );
                 }
@@ -707,7 +707,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = (rProp.Value >>= sVal);
-                    DBG_ASSERT( bOK, "invalid type or value for SalvageURL" )
+                    DBG_ASSERT( bOK, "invalid type or value for SalvageURL" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_PATH, sVal ) );
                 }
@@ -715,7 +715,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = (rProp.Value >>= sVal);
-                    DBG_ASSERT( bOK, "invalid type for FrameName" )
+                    DBG_ASSERT( bOK, "invalid type for FrameName" );
                     if (bOK && sVal.getLength())
                         rSet.Put( SfxStringItem( SID_TARGETNAME, sVal ) );
                 }
@@ -723,7 +723,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for MediaType" )
+                    DBG_ASSERT( bOK, "invalid type or value for MediaType" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_CONTENTTYPE, sVal ) );
                 }
@@ -731,7 +731,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for WindowState" )
+                    DBG_ASSERT( bOK, "invalid type or value for WindowState" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_WIN_POSSIZE, sVal ) );
                 }
@@ -739,7 +739,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for TemplateName" )
+                    DBG_ASSERT( bOK, "invalid type or value for TemplateName" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_TEMPLATE_NAME, sVal ) );
                 }
@@ -747,7 +747,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for TemplateRegionName" )
+                    DBG_ASSERT( bOK, "invalid type or value for TemplateRegionName" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_TEMPLATE_REGIONNAME, sVal ) );
                 }
@@ -755,7 +755,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for JumpMark" )
+                    DBG_ASSERT( bOK, "invalid type or value for JumpMark" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_JUMPMARK, sVal ) );
                 }
@@ -763,7 +763,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for CharacterSet" )
+                    DBG_ASSERT( bOK, "invalid type or value for CharacterSet" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_CHARSET, sVal ) );
                 }
@@ -771,7 +771,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for FilterFlags" )
+                    DBG_ASSERT( bOK, "invalid type or value for FilterFlags" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_FILE_FILTEROPTIONS, sVal ) );
                 }
@@ -779,7 +779,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Int16 nVal =-1;
                     sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
-                    DBG_ASSERT( bOK, "invalid type for MacroExecMode" )
+                    DBG_ASSERT( bOK, "invalid type for MacroExecMode" );
                     if (bOK)
                         rSet.Put( SfxUInt16Item( SID_MACROEXECMODE, nVal ) );
                 }
@@ -787,7 +787,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Int16 nVal =-1;
                     sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1));
-                    DBG_ASSERT( bOK, "invalid type for UpdateDocMode" )
+                    DBG_ASSERT( bOK, "invalid type for UpdateDocMode" );
                     if (bOK)
                         rSet.Put( SfxUInt16Item( SID_UPDATEDOCMODE, nVal ) );
                 }
@@ -795,7 +795,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for RepairPackage" )
+                    DBG_ASSERT( bOK, "invalid type for RepairPackage" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_REPAIRPACKAGE, bVal ) );
                 }
@@ -803,7 +803,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for DocumentTitle" )
+                    DBG_ASSERT( bOK, "invalid type or value for DocumentTitle" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_DOCINFO_TITLE, sVal ) );
                 }
@@ -812,7 +812,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                     ::rtl::OUString sVal;
                     // the base url can be set to empty ( for embedded objects for example )
                     sal_Bool bOK = (rProp.Value >>= sVal);
-                    DBG_ASSERT( bOK, "invalid type or value for DocumentBaseURL" )
+                    DBG_ASSERT( bOK, "invalid type or value for DocumentBaseURL" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_DOC_BASEURL, sVal ) );
                 }
@@ -820,7 +820,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     ::rtl::OUString sVal;
                     sal_Bool bOK = ((rProp.Value >>= sVal) && sVal.getLength());
-                    DBG_ASSERT( bOK, "invalid type or value for HierarchicalDocumentName" )
+                    DBG_ASSERT( bOK, "invalid type or value for HierarchicalDocumentName" );
                     if (bOK)
                         rSet.Put( SfxStringItem( SID_DOC_HIERARCHICALNAME, sVal ) );
                 }
@@ -828,7 +828,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for CopyStreamIfPossible" )
+                    DBG_ASSERT( bOK, "invalid type for CopyStreamIfPossible" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_COPY_STREAM_IF_POSSIBLE, bVal ) );
                 }
@@ -836,7 +836,7 @@ void TransformParameters( sal_uInt16 nSlotId, const ::com::sun::star::uno::Seque
                 {
                     sal_Bool bVal = sal_False;
                     sal_Bool bOK = (rProp.Value >>= bVal);
-                    DBG_ASSERT( bOK, "invalid type for NoAutoSave" )
+                    DBG_ASSERT( bOK, "invalid type for NoAutoSave" );
                     if (bOK)
                         rSet.Put( SfxBoolItem( SID_NOAUTOSAVE, bVal ) );
                 }
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index e2b28e64c6..de1c524ec7 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -185,7 +185,7 @@ BOOL SvLinkManager::InsertDDELink( SvBaseLink * pLink,
 
 BOOL SvLinkManager::InsertDDELink( SvBaseLink * pLink )
 {
-    DBG_ASSERT( OBJECT_CLIENT_SO & pLink->GetObjType(), "no OBJECT_CLIENT_SO" )
+    DBG_ASSERT( OBJECT_CLIENT_SO & pLink->GetObjType(), "no OBJECT_CLIENT_SO" );
     if( !( OBJECT_CLIENT_SO & pLink->GetObjType() ) )
         return FALSE;
 
diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx
index 6858ef4ad3..41a139d19b 100644
--- a/sfx2/source/appl/lnkbase2.cxx
+++ b/sfx2/source/appl/lnkbase2.cxx
@@ -260,8 +260,8 @@ IMPL_LINK( SvBaseLink, EndEditHdl, String*, _pNewName )
 
 void SvBaseLink::SetObjType( USHORT nObjTypeP )
 {
-    DBG_ASSERT( nObjType != OBJECT_CLIENT_DDE, "type already set" )
-    DBG_ASSERT( !xObj.Is(), "object exist" )
+    DBG_ASSERT( nObjType != OBJECT_CLIENT_DDE, "type already set" );
+    DBG_ASSERT( !xObj.Is(), "object exist" );
 
     nObjType = nObjTypeP;
 }
@@ -299,7 +299,7 @@ void SvBaseLink::SetObj( SvLinkSource * pObj )
     DBG_ASSERT( (nObjType & OBJECT_CLIENT_SO &&
                 pImplData->ClientType.bIntrnlLnk) ||
                 nObjType == OBJECT_CLIENT_GRF,
-                "no intern link" )
+                "no intern link" );
     xObj = pObj;
 }
 
@@ -425,7 +425,7 @@ void SvBaseLink::_GetRealObject( BOOL bConnect)
     if( !pImpl->m_pLinkMgr )
         return;
 
-    DBG_ASSERT( !xObj.Is(), "object already exist" )
+    DBG_ASSERT( !xObj.Is(), "object already exist" );
 
     if( OBJECT_CLIENT_DDE == nObjType )
     {
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 31e1f20a85..d6bfb67c4b 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -667,7 +667,7 @@ void SfxWorkWindow::Lock_Impl( BOOL bLock )
         --m_nLock;
     if ( m_nLock<0 )
     {
-        DBG_ERROR("Lock count underflow!")
+        DBG_ERROR("Lock count underflow!");
         m_nLock = 0;
     }
 
diff --git a/sfx2/source/bastyp/progress.cxx b/sfx2/source/bastyp/progress.cxx
index 800683bba0..2b74482051 100644
--- a/sfx2/source/bastyp/progress.cxx
+++ b/sfx2/source/bastyp/progress.cxx
@@ -769,7 +769,7 @@ void SfxProgress::EnterLock()
 void SfxProgress::LeaveLock()
 {
     SfxAppData_Impl *pImp = SFX_APP()->Get_Impl();
-    DBG_ASSERT( 0 != pImp->nRescheduleLocks, "SFxProgress::LeaveLock but no locks" )
+    DBG_ASSERT( 0 != pImp->nRescheduleLocks, "SFxProgress::LeaveLock but no locks" );
     pImp->nRescheduleLocks--;
 }
 
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 0354c8fcae..03d5c6f483 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -794,9 +794,9 @@ void SfxEventConfiguration::PropagateEvent_Impl( SfxObjectShell *pDoc,
                 xEvents->replaceByName( aEventName, aEventData );
             }
             catch( ::com::sun::star::lang::IllegalArgumentException )
-            { DBG_ERRORFILE( "PropagateEvents_Impl: caught IllegalArgumentException" ) }
+            { DBG_ERRORFILE( "PropagateEvents_Impl: caught IllegalArgumentException" ); }
             catch( ::com::sun::star::container::NoSuchElementException )
-            { DBG_ERRORFILE( "PropagateEvents_Impl: caught NoSuchElementException" ) }
+            { DBG_ERRORFILE( "PropagateEvents_Impl: caught NoSuchElementException" ); }
         }
         else {
             DBG_WARNING( "PropagateEvents_Impl: Got unkown event" );
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 1815e3714c..2afd8d6d55 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -604,7 +604,7 @@ void SfxMacro::Replace
 
 {
     DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" );
-    DBG_ASSERT( pImp->aList.Count(), "no replaceable statement available" )
+    DBG_ASSERT( pImp->aList.Count(), "no replaceable statement available" );
     pImp->aList.Remove( pImp->aList.Count() - 1 );
     pImp->aList.C40_INSERT( SfxMacroStatement,pStatement, pImp->aList.Count() );
 }
@@ -645,7 +645,7 @@ void SfxMacro::Remove()
 
 {
     DBG_ASSERT( pImp->eMode != SFX_MACRO_EXISTING, "invalid call to non-recording SfxMacro" );
-    DBG_ASSERT( pImp->aList.Count(), "no replaceable statement available" )
+    DBG_ASSERT( pImp->aList.Count(), "no replaceable statement available" );
     pImp->aList.Remove( pImp->aList.Count() - 1 );
 }
 
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 61728de25f..2f4eed0b03 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -1325,8 +1325,10 @@ sal_Int16 FileDialogHelper_Impl::implDoExecute()
 
     sal_Int16 nRet = ExecutableDialogResults::CANCEL;
 
-#if !(defined(MACOSX) && defined(QUARTZ))
 //On MacOSX the native file picker has to run in the primordial thread because of drawing issues
+//On Linux the native gtk file picker, when backed by gnome-vfs2, needs to be run in the same
+//primordial thread as the ucb gnome-vfs2 provider was initialized in.
+#ifdef WNT
     if ( mbSystemPicker )
     {
         PickerThread_Impl* pThread = new PickerThread_Impl( mxFileDlg );
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 3ea24031ff..84f764e03d 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -373,7 +373,7 @@ void SfxObjectShell::SetModified( sal_Bool bModifiedP )
 {
 #ifdef DBG_UTIL
     if ( !bModifiedP && !IsEnableSetModified() )
-        DBG_WARNING( "SFX_PERSIST: SetModified( sal_False ), obwohl IsEnableSetModified() == sal_False" )
+        DBG_WARNING( "SFX_PERSIST: SetModified( sal_False ), obwohl IsEnableSetModified() == sal_False" );
 #endif
 
     if( !IsEnableSetModified() )
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx
index e2c5edf141..d1487d3ebb 100644
--- a/sfx2/source/view/frame.cxx
+++ b/sfx2/source/view/frame.cxx
@@ -329,7 +329,7 @@ SfxFrame* SfxFrame::GetChildFrame( sal_uInt16 nPos ) const
 {
     if ( pChildArr && pChildArr->Count() > nPos )
     {
-        DBG_ASSERT( nPos < pChildArr->Count(), "Falscher Index!")
+        DBG_ASSERT( nPos < pChildArr->Count(), "Falscher Index!");
         return (*pChildArr)[nPos];
     }