1 files changed, 12 insertions, 12 deletions

diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx
index 9bc48b5ef64f..78f26f34cb28 100644..100755
--- a/sfx2/source/view/viewfrm2.cxx
+++ b/sfx2/source/view/viewfrm2.cxx
@@ -31,7 +31,7 @@
 
 #include "impviewframe.hxx"
 #include "statcach.hxx"
-#include "viewfac.hxx"
+#include "sfx2/viewfac.hxx"
 #include "workwin.hxx"
 
 #include "sfx2/app.hxx"
@@ -279,10 +279,10 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
     {
         case SID_SHOWPOPUPS :
         {
-            SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS, FALSE);
-            BOOL bShow = pShowItem ? pShowItem->GetValue() : TRUE;
-            SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID, FALSE);
-            USHORT nId = pIdItem ? pIdItem->GetValue() : 0;
+            SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS, sal_False);
+            sal_Bool bShow = pShowItem ? pShowItem->GetValue() : sal_True;
+            SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID, sal_False);
+            sal_uInt16 nId = pIdItem ? pIdItem->GetValue() : 0;
 
             // ausfuehren
             SfxWorkWindow *pWorkWin = GetFrame().GetWorkWindow_Impl();
@@ -290,7 +290,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
             {
                 // Zuerst die Floats auch anzeigbar machen
                 pWorkWin->MakeChildsVisible_Impl( bShow );
-                GetDispatcher()->Update_Impl( TRUE );
+                GetDispatcher()->Update_Impl( sal_True );
 
                 // Dann anzeigen
                 GetBindings().HidePopups( !bShow );
@@ -305,7 +305,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
                     pBind = pBind->GetSubBindings_Impl();
                 }
 
-                pWorkWin->HidePopups_Impl( !bShow, TRUE, nId );
+                pWorkWin->HidePopups_Impl( !bShow, sal_True, nId );
                 pWorkWin->MakeChildsVisible_Impl( bShow );
             }
 
@@ -316,14 +316,14 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
 
         case SID_ACTIVATE:
         {
-            MakeActive_Impl( TRUE );
+            MakeActive_Impl( sal_True );
             rReq.SetReturnValue( SfxObjectItem( 0, this ) );
             break;
         }
 
         case SID_NEWDOCDIRECT :
         {
-            SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, FALSE);
+            SFX_REQUEST_ARG( rReq, pFactoryItem, SfxStringItem, SID_NEWDOCDIRECT, sal_False);
             String aFactName;
             if ( pFactoryItem )
                 aFactName = pFactoryItem->GetValue();
@@ -367,11 +367,11 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
 
                 // Doc braucht nur gefragt zu werden, wenn keine weitere View
                 sal_Bool bClosed = sal_False;
-                sal_Bool bUI = TRUE;
+                sal_Bool bUI = sal_True;
                 if ( ( bOther || pDocSh->PrepareClose( bUI ) ) )
                 {
                     if ( !bOther )
-                        pDocSh->SetModified( FALSE );
+                        pDocSh->SetModified( sal_False );
                     rReq.Done(); // unbedingt vor Close() rufen!
                     bClosed = sal_False;
                     try
@@ -441,7 +441,7 @@ void SfxViewFrame::GetState_Impl( SfxItemSet &rSet )
                 {
                     uno::Any aAny;
                     aAny <<= GetViewShell()->GetVerbs();
-                    rSet.Put( SfxUnoAnyItem( USHORT( SID_OBJECT ), aAny ) );
+                    rSet.Put( SfxUnoAnyItem( sal_uInt16( SID_OBJECT ), aAny ) );
                 }
                 else
                     rSet.DisableItem( SID_OBJECT );