[Libreoffice-commits] .: cui/source
Joseph Powers
jpowers at kemper.freedesktop.org
Fri Jun 10 06:38:04 PDT 2011
cui/source/dialogs/cuigaldlg.cxx | 115 +++++++++++------------
cui/source/inc/cuigaldlg.hxx | 193 ++++++++++++++++++++-------------------
2 files changed, 158 insertions(+), 150 deletions(-)
New commits:
commit 86090f39ba440ff5a973f83a12d436920b2ee588
Author: Joseph Powers <jpowers27 at cox.net>
Date: Fri Jun 10 06:37:20 2011 -0700
Replace List with vector< sal_uLong >
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 2212837..d39e95a 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -83,8 +83,8 @@ using namespace ::com::sun::star::uno;
SearchThread::SearchThread( SearchProgress* pProgess,
TPGalleryThemeProperties* pBrowser,
const INetURLObject& rStartURL ) :
- mpProgress ( pProgess ),
- mpBrowser ( pBrowser ),
+ mpProgress ( pProgess ),
+ mpBrowser ( pBrowser ),
maStartURL ( rStartURL )
{
}
@@ -144,8 +144,8 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
try
{
- ::com::sun::star::uno::Reference< XCommandEnvironment > xEnv;
- Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
+ ::com::sun::star::uno::Reference< XCommandEnvironment > xEnv;
+ Content aCnt( rStartURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv );
Sequence< OUString > aProps( 2 );
aProps.getArray()[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "IsFolder" ));
@@ -227,7 +227,7 @@ SearchProgress::SearchProgress( Window* pParent, const INetURLObject& rStartURL
aFtSearchType ( this, CUI_RES( FT_SEARCH_TYPE ) ),
aFLSearchType ( this, CUI_RES( FL_SEARCH_TYPE ) ),
aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
- maSearchThread ( this, (TPGalleryThemeProperties*) pParent, rStartURL )
+ maSearchThread ( this, (TPGalleryThemeProperties*) pParent, rStartURL )
{
FreeResource();
aBtnCancel.SetClickHdl( LINK( this, SearchProgress, ClickCancelBtn ) );
@@ -279,10 +279,14 @@ void SearchProgress::StartExecuteModal( const Link& rEndDialogHdl )
// - TakeThread -
// --------------
-TakeThread::TakeThread( TakeProgress* pProgess, TPGalleryThemeProperties* pBrowser, List& rTakenList ) :
- mpProgress ( pProgess ),
- mpBrowser ( pBrowser ),
- mrTakenList ( rTakenList )
+TakeThread::TakeThread(
+ TakeProgress* pProgess,
+ TPGalleryThemeProperties* pBrowser,
+ TokenList_impl& rTakenList
+) :
+ mpProgress ( pProgess ),
+ mpBrowser ( pBrowser ),
+ mrTakenList ( rTakenList )
{
}
@@ -296,12 +300,12 @@ TakeThread::~TakeThread()
void SAL_CALL TakeThread::run()
{
- String aName;
- INetURLObject aURL;
- sal_uInt16 nEntries;
- GalleryTheme* pThm = mpBrowser->GetXChgData()->pTheme;
- sal_uInt16 nPos;
- GalleryProgress* pStatusProgress;
+ String aName;
+ INetURLObject aURL;
+ sal_uInt16 nEntries;
+ GalleryTheme* pThm = mpBrowser->GetXChgData()->pTheme;
+ sal_uInt16 nPos;
+ GalleryProgress* pStatusProgress;
{
SolarMutexGuard aGuard;
@@ -319,7 +323,7 @@ void SAL_CALL TakeThread::run()
aURL = INetURLObject(*mpBrowser->aFoundList[ nPos = mpBrowser->aLbxFound.GetSelectEntryPos( i ) ]);
// Position in Taken-Liste uebernehmen
- mrTakenList.Insert( (void*) (sal_uLong)nPos, LIST_APPEND );
+ mrTakenList.push_back( (sal_uLong)nPos );
{
SolarMutexGuard aGuard;
@@ -382,7 +386,7 @@ IMPL_LINK( TakeProgress, ClickCancelBtn, void*, EMPTYARG )
IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG )
{
- TPGalleryThemeProperties* mpBrowser = (TPGalleryThemeProperties*) GetParent();
+ TPGalleryThemeProperties* mpBrowser = (TPGalleryThemeProperties*) GetParent();
::std::vector<bool, std::allocator<bool> > aRemoveEntries( mpBrowser->aFoundList.size(), false );
::std::vector< String > aRemainingVector;
sal_uInt32 i, nCount;
@@ -392,10 +396,9 @@ IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG )
mpBrowser->aLbxFound.SetNoSelection();
// mark all taken positions in aRemoveEntries
- for( i = 0UL, nCount = maTakenList.Count(); i < nCount; ++i )
- aRemoveEntries[ (sal_uLong) maTakenList.GetObject( i ) ] = true;
-
- maTakenList.Clear();
+ for( i = 0, nCount = maTakenList.size(); i < nCount; ++i )
+ aRemoveEntries[ maTakenList[ i ] ] = true;
+ maTakenList.clear();
// refill found list
for( i = 0, nCount = aRemoveEntries.size(); i < nCount; ++i )
@@ -455,11 +458,11 @@ void TakeProgress::StartExecuteModal( const Link& rEndDialogHdl )
// ---------------------
ActualizeProgress::ActualizeProgress( Window* pWindow, GalleryTheme* pThm ) :
- ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ),
- aFtActualizeFile ( this, CUI_RES( FT_ACTUALIZE_FILE ) ),
+ ModalDialog ( pWindow, CUI_RES( RID_SVXDLG_GALLERY_ACTUALIZE_PROGRESS ) ),
+ aFtActualizeFile ( this, CUI_RES( FT_ACTUALIZE_FILE ) ),
aFLActualizeProgress ( this, CUI_RES( FL_ACTUALIZE_PROGRESS ) ),
- aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
- pTheme ( pThm )
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ pTheme ( pThm )
{
FreeResource();
aBtnCancel.SetClickHdl( LINK( this, ActualizeProgress, ClickCancelBtn ) );
@@ -536,12 +539,12 @@ IMPL_LINK( ActualizeProgress, ActualizeHdl, INetURLObject*, pURL )
// ---------------
TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) :
- ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ),
- maOk ( this, CUI_RES( BTN_OK ) ),
- maCancel ( this, CUI_RES( BTN_CANCEL ) ),
- maHelp ( this, CUI_RES( BTN_HELP ) ),
+ ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_TITLE ) ),
+ maOk ( this, CUI_RES( BTN_OK ) ),
+ maCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ maHelp ( this, CUI_RES( BTN_HELP ) ),
maFL ( this, CUI_RES( FL_TITLE ) ),
- maEdit ( this, CUI_RES( EDT_TITLE ) )
+ maEdit ( this, CUI_RES( EDT_TITLE ) )
{
FreeResource();
maEdit.SetText( rOldTitle );
@@ -553,12 +556,12 @@ TitleDialog::TitleDialog( Window* pParent, const String& rOldTitle ) :
// -------------------
GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
- ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ),
- aBtnOk ( this, CUI_RES( BTN_OK ) ),
- aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
+ ModalDialog ( pParent, CUI_RES( RID_SVXDLG_GALLERY_THEMEID ) ),
+ aBtnOk ( this, CUI_RES( BTN_OK ) ),
+ aBtnCancel ( this, CUI_RES( BTN_CANCEL ) ),
aFLId ( this, CUI_RES( FL_ID ) ),
- aLbResName ( this, CUI_RES( LB_RESNAME ) ),
- pThm ( _pThm )
+ aLbResName ( this, CUI_RES( LB_RESNAME ) ),
+ pThm ( _pThm )
{
FreeResource();
@@ -576,9 +579,9 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
{
- Gallery* pGal = pThm->GetParent();
- const sal_uLong nId = GetId();
- sal_Bool bDifferentThemeExists = sal_False;
+ Gallery* pGal = pThm->GetParent();
+ const sal_uLong nId = GetId();
+ sal_Bool bDifferentThemeExists = sal_False;
for( sal_uLong i = 0, nCount = pGal->GetThemeCount(); i < nCount && !bDifferentThemeExists; i++ )
{
@@ -612,7 +615,7 @@ IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
GalleryThemeProperties::GalleryThemeProperties( Window* pParent, ExchangeData* _pData, SfxItemSet* pItemSet ) :
SfxTabDialog ( pParent, CUI_RES( RID_SVXTABDLG_GALLERYTHEME ), pItemSet ),
- pData ( _pData )
+ pData ( _pData )
{
FreeResource();
@@ -666,7 +669,7 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet&
String aAccName(SVX_RES(RID_SVXSTR_GALLERY_THEMENAME));
aEdtMSName.SetAccessibleName(aAccName);
aFiMSImage.SetAccessibleName(aAccName);
- aEdtMSName.SetAccessibleRelationLabeledBy( &aFiMSImage );
+ aEdtMSName.SetAccessibleRelationLabeledBy( &aFiMSImage );
}
// ------------------------------------------------------------------------
@@ -675,12 +678,12 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
{
pData = _pData;
- GalleryTheme* pThm = pData->pTheme;
+ GalleryTheme* pThm = pData->pTheme;
String aOutStr( String::CreateFromInt32( pThm->GetObjectCount() ) );
String aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
String aAccess;
- String aType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
- sal_Bool bReadOnly = pThm->IsReadOnly() && !pThm->IsImported();
+ String aType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
+ sal_Bool bReadOnly = pThm->IsReadOnly() && !pThm->IsImported();
aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME );
aEdtMSName.SetText( pThm->GetName() );
@@ -753,7 +756,7 @@ SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet& rS
// ----------------------------
TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) :
- SfxTabPage ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ),
+ SfxTabPage ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ),
aFtFileType ( this, CUI_RES(FT_FILETYPE ) ),
aCbbFileType ( this, CUI_RES(CBB_FILETYPE ) ),
aLbxFound ( this, CUI_RES(LBX_FOUND ) ),
@@ -862,12 +865,12 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet&
void TPGalleryThemeProperties::FillFilterList()
{
GraphicFilter &rFilter = GraphicFilter::GetGraphicFilter();
- String aExt;
- String aName;
- FilterEntry* pFilterEntry;
- FilterEntry* pTestEntry;
- sal_uInt16 i, nKeyCount;
- sal_Bool bInList;
+ String aExt;
+ String aName;
+ FilterEntry* pFilterEntry;
+ FilterEntry* pTestEntry;
+ sal_uInt16 i, nKeyCount;
+ sal_Bool bInList;
// graphic filters
for( i = 0, nKeyCount = rFilter.GetImportFormatCount(); i < nKeyCount; i++ )
@@ -912,10 +915,10 @@ void TPGalleryThemeProperties::FillFilterList()
}
// media filters
- static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
- ::avmedia::FilterNameVector aFilters;
- const ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
- ::rtl::OUString aAllTypes;
+ static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
+ ::avmedia::FilterNameVector aFilters;
+ const ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
+ ::rtl::OUString aAllTypes;
::avmedia::MediaWindow::getMediaFilters( aFilters );
@@ -1001,7 +1004,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFileTypeHdl, void *, EMPTYARG )
void TPGalleryThemeProperties::SearchFiles()
{
- SearchProgress* pProgress = new SearchProgress( this, aURL );
+ SearchProgress* pProgress = new SearchProgress( this, aURL );
for ( size_t i = 0, n = aFoundList.size(); i < n; ++i )
delete aFoundList[ i ];
@@ -1043,7 +1046,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickSearchHdl, void *, EMPTYARG )
if ( xFolderPicker.is() )
{
- String aDlgPathName( SvtPathOptions().GetGraphicPath() );
+ String aDlgPathName( SvtPathOptions().GetGraphicPath() );
xFolderPicker->setDisplayDirectory(aDlgPathName);
aPreviewTimer.Stop();
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 58b5dfb..0d82fd0 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -59,7 +59,8 @@ class SearchProgress;
class TakeProgress;
class TPGalleryThemeProperties;
-typedef ::std::vector< UniString* > StringList;
+typedef ::std::vector< UniString* > StringList;
+typedef ::std::vector< sal_uLong > TokenList_impl;
// ---------------
// - FilterEntry -
@@ -67,7 +68,7 @@ typedef ::std::vector< UniString* > StringList;
struct FilterEntry
{
- String aFilterName;
+ String aFilterName;
};
// ----------------
@@ -78,15 +79,15 @@ class SearchThread : public ::osl::Thread
{
private:
- SearchProgress* mpProgress;
- TPGalleryThemeProperties* mpBrowser;
- INetURLObject maStartURL;
+ SearchProgress* mpProgress;
+ TPGalleryThemeProperties* mpBrowser;
+ INetURLObject maStartURL;
- void ImplSearch( const INetURLObject& rStartURL,
+ void ImplSearch( const INetURLObject& rStartURL,
const ::std::vector< String >& rFormats,
sal_Bool bRecursive );
- virtual void SAL_CALL run();
+ virtual void SAL_CALL run();
virtual void SAL_CALL onTerminated();
public:
@@ -94,7 +95,7 @@ public:
SearchThread( SearchProgress* pProgess,
TPGalleryThemeProperties* pBrowser,
const INetURLObject& rStartURL );
- virtual ~SearchThread();
+ virtual ~SearchThread();
};
// ------------------
@@ -105,15 +106,15 @@ class SearchProgress : public ModalDialog
{
private:
- FixedText aFtSearchDir;
+ FixedText aFtSearchDir;
FixedLine aFLSearchDir;
- FixedText aFtSearchType;
+ FixedText aFtSearchType;
FixedLine aFLSearchType;
- CancelButton aBtnCancel;
- SearchThread maSearchThread;
+ CancelButton aBtnCancel;
+ SearchThread maSearchThread;
DECL_LINK( ClickCancelBtn, void* );
- void Terminate();
+ void Terminate();
public:
SearchProgress( Window* pParent, const INetURLObject& rStartURL );
@@ -121,10 +122,10 @@ public:
DECL_LINK( CleanUpHdl, void* );
- virtual short Execute();
+ virtual short Execute();
virtual void StartExecuteModal( const Link& rEndDialogHdl );
- void SetFileType( const String& rType ) { aFtSearchType.SetText( rType ); }
- void SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); }
+ void SetFileType( const String& rType ) { aFtSearchType.SetText( rType ); }
+ void SetDirectory( const INetURLObject& rURL ) { aFtSearchDir.SetText( GetReducedString( rURL, 30 ) ); }
};
// --------------
@@ -135,16 +136,20 @@ class TakeThread : public ::osl::Thread
{
private:
- TakeProgress* mpProgress;
- TPGalleryThemeProperties* mpBrowser;
- List& mrTakenList;
+ TakeProgress* mpProgress;
+ TPGalleryThemeProperties* mpBrowser;
+ TokenList_impl& mrTakenList;
- virtual void SAL_CALL run();
+ virtual void SAL_CALL run();
virtual void SAL_CALL onTerminated();
public:
- TakeThread( TakeProgress* pProgess, TPGalleryThemeProperties* pBrowser, List& rTakenList );
+ TakeThread(
+ TakeProgress* pProgess,
+ TPGalleryThemeProperties* pBrowser,
+ TokenList_impl& rTakenList
+ );
virtual ~TakeThread();
};
@@ -156,14 +161,14 @@ class TakeProgress : public ModalDialog
{
private:
- FixedText aFtTakeFile;
+ FixedText aFtTakeFile;
FixedLine aFLTakeProgress;
- CancelButton aBtnCancel;
- TakeThread maTakeThread;
- List maTakenList;
+ CancelButton aBtnCancel;
+ TakeThread maTakeThread;
+ TokenList_impl maTakenList;
DECL_LINK( ClickCancelBtn, void* );
- void Terminate();
+ void Terminate();
public:
@@ -172,8 +177,8 @@ public:
DECL_LINK( CleanUpHdl, void* );
- void SetFile( const INetURLObject& rURL ) { aFtTakeFile.SetText( GetReducedString( rURL, 30 ) ); }
- virtual short Execute();
+ void SetFile( const INetURLObject& rURL ) { aFtTakeFile.SetText( GetReducedString( rURL, 30 ) ); }
+ virtual short Execute();
virtual void StartExecuteModal( const Link& rEndDialogHdl );
};
@@ -185,12 +190,12 @@ class ActualizeProgress : public ModalDialog
{
private:
- FixedText aFtActualizeFile;
+ FixedText aFtActualizeFile;
FixedLine aFLActualizeProgress;
- CancelButton aBtnCancel;
- Timer* pTimer;
- GalleryTheme* pTheme;
- GalleryProgress aStatusProgress;
+ CancelButton aBtnCancel;
+ Timer* pTimer;
+ GalleryTheme* pTheme;
+ GalleryProgress aStatusProgress;
DECL_LINK( ClickCancelBtn, void* );
DECL_LINK( TimeoutHdl, Timer* );
@@ -200,7 +205,7 @@ public:
ActualizeProgress( Window* pWindow, GalleryTheme* pThm );
~ActualizeProgress() {};
- virtual short Execute();
+ virtual short Execute();
};
// ---------------
@@ -211,16 +216,16 @@ class TitleDialog : public ModalDialog
{
private:
- OKButton maOk;
- CancelButton maCancel;
- HelpButton maHelp;
+ OKButton maOk;
+ CancelButton maCancel;
+ HelpButton maHelp;
FixedLine maFL;
- Edit maEdit;
+ Edit maEdit;
public:
TitleDialog( Window* pParent, const String& rOldText );
- String GetTitle() const { return maEdit.GetText(); }
+ String GetTitle() const { return maEdit.GetText(); }
};
// -------------------
@@ -231,11 +236,11 @@ class GalleryIdDialog : public ModalDialog
{
private:
- OKButton aBtnOk;
- CancelButton aBtnCancel;
+ OKButton aBtnOk;
+ CancelButton aBtnCancel;
FixedLine aFLId;
- ListBox aLbResName;
- GalleryTheme* pThm;
+ ListBox aLbResName;
+ GalleryTheme* pThm;
DECL_LINK( ClickOkHdl, void* );
DECL_LINK( ClickResNameHdl, void* );
@@ -245,7 +250,7 @@ public:
GalleryIdDialog( Window* pParent, GalleryTheme* pThm );
~GalleryIdDialog() {}
- sal_uLong GetId() const { return aLbResName.GetSelectEntryPos(); }
+ sal_uLong GetId() const { return aLbResName.GetSelectEntryPos(); }
};
// --------------------------
@@ -254,9 +259,9 @@ public:
class GalleryThemeProperties : public SfxTabDialog
{
- ExchangeData* pData;
+ ExchangeData* pData;
- virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
public:
@@ -272,21 +277,21 @@ class TPGalleryThemeGeneral : public SfxTabPage
{
private:
- FixedImage aFiMSImage;
- Edit aEdtMSName;
- FixedLine aFlMSGeneralFirst;
- FixedText aFtMSType;
- FixedText aFtMSShowType;
- FixedText aFtMSPath;
- FixedText aFtMSShowPath;
- FixedText aFtMSContent;
- FixedText aFtMSShowContent;
- FixedLine aFlMSGeneralSecond;
- FixedText aFtMSChangeDate;
- FixedText aFtMSShowChangeDate;
- ExchangeData* pData;
-
- virtual void Reset( const SfxItemSet& ) {}
+ FixedImage aFiMSImage;
+ Edit aEdtMSName;
+ FixedLine aFlMSGeneralFirst;
+ FixedText aFtMSType;
+ FixedText aFtMSShowType;
+ FixedText aFtMSPath;
+ FixedText aFtMSShowPath;
+ FixedText aFtMSContent;
+ FixedText aFtMSShowContent;
+ FixedLine aFlMSGeneralSecond;
+ FixedText aFtMSChangeDate;
+ FixedText aFtMSShowChangeDate;
+ ExchangeData* pData;
+
+ virtual void Reset( const SfxItemSet& ) {}
virtual sal_Bool FillItemSet( SfxItemSet& rSet );
@@ -295,10 +300,10 @@ public:
TPGalleryThemeGeneral( Window* pParent, const SfxItemSet& rSet );
~TPGalleryThemeGeneral() {}
- void SetXChgData( ExchangeData* pData );
- const ExchangeData* GetXChgData() const { return pData; }
+ void SetXChgData( ExchangeData* pData );
+ const ExchangeData* GetXChgData() const { return pData; }
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
};
// ----------------------------
@@ -311,28 +316,28 @@ class TPGalleryThemeProperties : public SfxTabPage
friend class TakeProgress;
friend class TakeThread;
- FixedText aFtFileType;
- ComboBox aCbbFileType;
- MultiListBox aLbxFound;
- PushButton aBtnSearch;
- PushButton aBtnTake;
- PushButton aBtnTakeAll;
- CheckBox aCbxPreview;
- GalleryPreview aWndPreview;
-
- ExchangeData* pData;
- StringList aFoundList;
- List aFilterEntryList;
- Timer aPreviewTimer;
- String aLastFilterName;
- String aPreviewString;
- INetURLObject aURL;
- sal_uInt16 nCurFilterPos;
- sal_uInt16 nFirstExtFilterPos;
- sal_Bool bEntriesFound;
- sal_Bool bInputAllowed;
- sal_Bool bTakeAll;
- sal_Bool bSearchRecursive;
+ FixedText aFtFileType;
+ ComboBox aCbbFileType;
+ MultiListBox aLbxFound;
+ PushButton aBtnSearch;
+ PushButton aBtnTake;
+ PushButton aBtnTakeAll;
+ CheckBox aCbxPreview;
+ GalleryPreview aWndPreview;
+
+ ExchangeData* pData;
+ StringList aFoundList;
+ List aFilterEntryList;
+ Timer aPreviewTimer;
+ String aLastFilterName;
+ String aPreviewString;
+ INetURLObject aURL;
+ sal_uInt16 nCurFilterPos;
+ sal_uInt16 nFirstExtFilterPos;
+ sal_Bool bEntriesFound;
+ sal_Bool bInputAllowed;
+ sal_Bool bTakeAll;
+ sal_Bool bSearchRecursive;
::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer;
@@ -340,12 +345,12 @@ class TPGalleryThemeProperties : public SfxTabPage
virtual void Reset( const SfxItemSet& /*rSet*/ ) {}
virtual sal_Bool FillItemSet( SfxItemSet& /*rSet*/ ) { return sal_True; }
- ::rtl::OUString addExtension( const ::rtl::OUString&, const ::rtl::OUString& );
- void FillFilterList();
+ ::rtl::OUString addExtension( const ::rtl::OUString&, const ::rtl::OUString& );
+ void FillFilterList();
- void SearchFiles();
- void TakeFiles();
- void DoPreview();
+ void SearchFiles();
+ void TakeFiles();
+ void DoPreview();
DECL_LINK( ClickPreviewHdl, void* );
DECL_LINK( ClickCloseBrowserHdl, void* );
@@ -364,12 +369,12 @@ public:
TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet );
~TPGalleryThemeProperties();
- void SetXChgData( ExchangeData* pData );
- const ExchangeData* GetXChgData() const { return pData; }
+ void SetXChgData( ExchangeData* pData );
+ const ExchangeData* GetXChgData() const { return pData; }
void StartSearchFiles( const String& _rFolderURL, short _nDlgResult );
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
};
#endif // _CUI_GALDLG_HXX_
More information about the Libreoffice-commits
mailing list