Commits

Anonymous committed b21379a

rebased.

Comments (0)

Files changed (3)

fpicker/source/office/iodlg.hxx

 
 //*****************************************************************************
 
-#define SFXWB_INSERT			( 0x04000000L | WB_OPEN )
-#define SFXWB_PASSWORD			WB_PASSWORD
-#define SFXWB_READONLY			WB_READONLY
-#define SFXWB_PATHDIALOG		WB_PATH
-#define SFXWB_CLASSPATH			( 0x08000000L | SFXWB_PATHDIALOG )
-#define SFXWB_SHOWALLFOLDER		0x10000000L		// alle Ordner auch Mail/News/...
-#define SFXWB_MULTISELECTION	0x20000000L		// Multiselection an
+#define SFXWB_INSERT            ( 0x04000000L | WB_OPEN )
+#define SFXWB_PASSWORD          WB_PASSWORD
+#define SFXWB_READONLY          WB_READONLY
+#define SFXWB_PATHDIALOG        WB_PATH
+#define SFXWB_CLASSPATH         ( 0x08000000L | SFXWB_PATHDIALOG )
+#define SFXWB_SHOWALLFOLDER     0x10000000L     // alle Ordner auch Mail/News/...
+#define SFXWB_MULTISELECTION    0x20000000L     // Multiselection an
 #define SFXWB_NOREMOTE          0x40000000L
-#define SFXWB_SHOWVERSIONS		0x80000000L     // Versionsauswahl anzeigen
+#define SFXWB_SHOWVERSIONS      0x80000000L     // Versionsauswahl anzeigen
 
 #define SFX_EXTRA_AUTOEXTENSION     0x00000001L
 #define SFX_EXTRA_FILTEROPTIONS     0x00000002L
 #define SFX_EXTRA_SELECTION         0x00000080L
 #define SFX_EXTRA_IMAGE_TEMPLATE    0x00000100L
 
-#define RET_MANAGER				100
+#define RET_MANAGER                 100
 
-#define FILEDIALOG_FILTER_ALL	"*.*"
+#define FILEDIALOG_FILTER_ALL       "*.*"
 
 //*****************************************************************************
 // SvtFileDialog
         This is under the assumption that you'll use EnableControl. Direct access to the control
         (such as pControl->Enable()) will break this.
     */
-    void EnableUI( BOOL _bEnable );
+    void EnableUI( sal_Bool _bEnable );
 
     /** enables or disables a control
 

fpicker/source/office/placeswin.cxx

 
     struct SvtResId : public ResId
     {
-        SvtResId (USHORT nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
+        SvtResId (sal_uInt16 nId) : ResId (nId, *ResMgrHolder::getOrCreate()) {}
     };
 }
 
 {
     aIconCtrl.SetAccessibleName( String( RTL_CONSTASCII_USTRINGPARAM( "Places" ) ) );
     // @@@ KSO: no hid! aIconCtrl.SetHelpId( HID_FILEDLG_PLACESCTRL );
-    aIconCtrl.SetChoiceWithCursor( TRUE );
+    aIconCtrl.SetChoiceWithCursor( sal_True );
     aIconCtrl.SetSelectionMode( SINGLE_SELECTION );
     aIconCtrl.Show();
 
 
 PlacesWindow::~PlacesWindow()
 {
-    for ( ULONG i = 0; i < aIconCtrl.GetEntryCount(); ++i )
+    for ( sal_uLong i = 0; i < aIconCtrl.GetEntryCount(); ++i )
     {
         SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.GetEntry( i );
         delete (String*)pEntry->GetUserData();
 SvxIconChoiceCtrlEntry* PlacesWindow::GetEntry( const String& rURL ) const
 {
     SvxIconChoiceCtrlEntry* pEntry = NULL;
-    for ( ULONG i = 0; i < aIconCtrl.GetEntryCount(); ++i )
+    for ( sal_uLong i = 0; i < aIconCtrl.GetEntryCount(); ++i )
     {
         SvxIconChoiceCtrlEntry* pTemp = aIconCtrl.GetEntry( i );
         String aURL( *( (String*)pTemp->GetUserData() ) );
 
 String PlacesWindow::GetSelectedIconURL() const
 {
-    ULONG nPos;
+    sal_uLong nPos;
     SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.GetSelectedEntry( nPos );
     String aURL;
     if ( pEntry )
 
 String PlacesWindow::GetSelectedIconText() const
 {
-    ULONG nPos;
+    sal_uLong nPos = 0;
     return MnemonicGenerator::EraseAllMnemonicChars( aIconCtrl.GetSelectedEntry( nPos )->GetText() );
 }
 
     aIconCtrl.Invalidate();
 }
 
-ULONG PlacesWindow::GetCursorPos() const
+sal_uLong PlacesWindow::GetCursorPos() const
 {
-    ULONG nPos = ~ULONG(0);
+    sal_uLong nPos = ~sal_uLong( 0 );
 
     SvxIconChoiceCtrlEntry* pCursorEntry = aIconCtrl.GetCursor( );
     if ( pCursorEntry )
     return nPos;
 }
 
-ULONG PlacesWindow::GetSelectEntryPos() const
+sal_uLong PlacesWindow::GetSelectEntryPos() const
 {
-    ULONG nPos;
+    sal_uLong nPos = 0;
     if ( !aIconCtrl.GetSelectedEntry( nPos ) )
-        nPos = ~ULONG(0);
+        nPos = ~sal_uLong( 0 );
     return nPos;
 }
 
-void PlacesWindow::SetCursorPos( ULONG nPos )
+void PlacesWindow::SetCursorPos( sal_uLong nPos )
 {
     SvxIconChoiceCtrlEntry* pEntry = aIconCtrl.GetEntry( nPos );
     aIconCtrl.SetCursor( pEntry );
 {
     // calculate the required height of the IconControl
     long nHeight = 0;
-    ULONG nCount = aIconCtrl.GetEntryCount();
+    sal_uLong nCount = aIconCtrl.GetEntryCount();
     if ( nCount > 0 )
         // bottom of the last icon
         nHeight = aIconCtrl.GetEntry(nCount-1)->GetBoundRect().Bottom();
     return nHeight;
 }
 
-ULONG PlacesWindow::GetEntryCount() const
+sal_uLong PlacesWindow::GetEntryCount() const
 {
     return aIconCtrl.GetEntryCount();
 }

fpicker/source/office/placeswin.hxx

     String       GetCursorPosIconURL() const;
     String       GetIconText( const String& rURL ) const;
     void         InvalidateIconControl();
-    void         SetCursorPos( ULONG nPos );
-    ULONG        GetCursorPos() const;
-    ULONG        GetSelectEntryPos() const;
+    void         SetCursorPos( sal_uLong nPos );
+    sal_uLong    GetCursorPos() const;
+    sal_uLong    GetSelectEntryPos() const;
     void         SetFocus();
     long         CalcHeight() const;
-    ULONG        GetEntryCount() const;
+    sal_uLong    GetEntryCount() const;
 
     inline sal_Bool ProcessKeyEvent( const KeyEvent& rKEvt );