CWS-TOOLING: integrate CWS fwk120

3 files changed, 18 insertions, 24 deletions

diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 84c2ae9b9a95..16728ca544c9 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -1132,7 +1132,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
                                                         xRef( pClipCntnr );
 
                         pClipCntnr->CopyAnyData( FORMAT_RTF, (sal_Char*)
-                                        pStrm->GetData(), pStrm->GetSize() );
+                                    pStrm->GetData(), pStrm->GetEndOfData() );
                         pClipCntnr->CopyToClipboard(
                             GetView()? (Window*)&GetView()->GetEditWin() : 0 );
                         delete pStrm;
diff --git a/sw/source/ui/misc/glshell.cxx b/sw/source/ui/misc/glshell.cxx
index 12befeaeb194..03e3bf12f1f0 100644
--- a/sw/source/ui/misc/glshell.cxx
+++ b/sw/source/ui/misc/glshell.cxx
@@ -154,10 +154,10 @@ BOOL lcl_Save( SwWrtShell& rSh, const String& rGroupName,
  --------------------------------------------------------------------*/
 
 
-SwGlosDocShell::SwGlosDocShell( sal_Bool bNewShow)
-    :
-    SwDocShell( bShow ? SFX_CREATE_MODE_STANDARD : SFX_CREATE_MODE_INTERNAL )
-    ,bShow ( bNewShow )
+SwGlosDocShell::SwGlosDocShell(sal_Bool bNewShow)
+    : SwDocShell( (bNewShow)
+            ? SFX_CREATE_MODE_STANDARD : SFX_CREATE_MODE_INTERNAL )
+    , bShow ( bNewShow )
 {
     SetHelpId(SW_GLOSDOCSHELL);
 }
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index ed6d61898804..7dc1ab7bf873 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -519,58 +519,54 @@ void SwXPrintSettings::_preGetValues ()
 void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue )
     throw(UnknownPropertyException, WrappedTargetException )
 {
-    sal_Bool bBool = TRUE;
-    sal_Bool bBoolVal;
     switch( rInfo.mnHandle )
     {
         case HANDLE_PRINTSET_LEFT_PAGES:
-            bBoolVal = mpPrtOpt->IsPrintLeftPage();
+            rValue <<= mpPrtOpt->IsPrintLeftPage();
         break;
         case HANDLE_PRINTSET_RIGHT_PAGES:
-            bBoolVal = mpPrtOpt->IsPrintRightPage();
+            rValue <<= mpPrtOpt->IsPrintRightPage();
         break;
         case HANDLE_PRINTSET_REVERSED:
-            bBoolVal = mpPrtOpt->IsPrintReverse();
+            rValue <<= mpPrtOpt->IsPrintReverse();
         break;
         case HANDLE_PRINTSET_PROSPECT:
-            bBoolVal = mpPrtOpt->IsPrintProspect();
+            rValue <<= mpPrtOpt->IsPrintProspect();
         break;
         case HANDLE_PRINTSET_GRAPHICS:
-            bBoolVal = mpPrtOpt->IsPrintGraphic();
+            rValue <<= mpPrtOpt->IsPrintGraphic();
         break;
         case HANDLE_PRINTSET_TABLES:
-            bBoolVal = mpPrtOpt->IsPrintTable();
+            rValue <<= mpPrtOpt->IsPrintTable();
         break;
         case HANDLE_PRINTSET_DRAWINGS:
-            bBoolVal = mpPrtOpt->IsPrintDraw();
+            rValue <<= mpPrtOpt->IsPrintDraw();
         break;
         case HANDLE_PRINTSET_CONTROLS:
-            bBoolVal = mpPrtOpt->IsPrintControl();
+            rValue <<= mpPrtOpt->IsPrintControl();
         break;
         case HANDLE_PRINTSET_PAGE_BACKGROUND:
-            bBoolVal = mpPrtOpt->IsPrintPageBackground();
+            rValue <<= mpPrtOpt->IsPrintPageBackground();
         break;
         case HANDLE_PRINTSET_BLACK_FONTS:
-            bBoolVal = mpPrtOpt->IsPrintBlackFont();
+            rValue <<= mpPrtOpt->IsPrintBlackFont();
         break;
         case HANDLE_PRINTSET_SINGLE_JOBS:
-            bBoolVal = mpPrtOpt->IsPrintSingleJobs();
+            rValue <<= mpPrtOpt->IsPrintSingleJobs();
         break;
         case HANDLE_PRINTSET_EMPTY_PAGES:
-            bBoolVal = mpPrtOpt->IsPrintEmptyPages();
+            rValue <<= mpPrtOpt->IsPrintEmptyPages();
         break;
         case HANDLE_PRINTSET_PAPER_FROM_SETUP:
-            bBoolVal = mpPrtOpt->IsPaperFromSetup();
+            rValue <<= mpPrtOpt->IsPaperFromSetup();
         break;
         case HANDLE_PRINTSET_ANNOTATION_MODE:
         {
-            bBool = FALSE;
             rValue <<= static_cast < sal_Int16 > ( mpPrtOpt->GetPrintPostIts() );
         }
         break;
         case HANDLE_PRINTSET_FAX_NAME :
         {
-            bBool = FALSE;
             rValue <<= mpPrtOpt->GetFaxName();
         }
         break;
@@ -592,8 +588,6 @@ void SwXPrintSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo,
         default:
             throw UnknownPropertyException();
     }
-    if(bBool)
-        rValue.setValue(&bBoolVal, ::getBooleanCppuType());
 }
 void SwXPrintSettings::_postGetValues ()
     throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException )