diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:51:57 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 04:35:19 -0600 |
| commit | 2a09751d51332aa413e769d0f7916aca0cf4e742 (patch) | |
| tree | 7e0b53c491ec182ca48e794cbafcbe0c2eb3a9d3 /fpicker | |
| parent | e23ea87cb395fe8dc3cdf5d6160962bc4b4dcd28 (diff) | |
Remove visual noise from fpicker
Change-Id: I58ae70cc71853e17e638ef64aaded87615e37986
Reviewed-on: https://gerrit.libreoffice.org/8264
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'fpicker')
88 files changed, 1098 insertions, 1098 deletions
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx index 4619f98457a7..b00aad9959bd 100644 --- a/fpicker/source/aqua/ControlHelper.hxx +++ b/fpicker/source/aqua/ControlHelper.hxx @@ -39,34 +39,34 @@ class ControlHelper { public: - //------------------------------------------------------------------------------------ + // Constructor / Destructor - //------------------------------------------------------------------------------------ + ControlHelper(); virtual ~ControlHelper(); - //------------------------------------------------ + // XInitialization delegate - //------------------------------------------------ + void initialize( sal_Int16 templateId ); - //------------------------------------------------------------------------------------ + // XFilePickerControlAccess function delegates - //------------------------------------------------------------------------------------ + void setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue ); uno::Any getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) const; void enableControl( sal_Int16 nControlId, sal_Bool bEnable ) const; OUString getLabel( sal_Int16 nControlId ); void setLabel( sal_Int16 nControlId, NSString* aLabel ); - //------------------------------------------------------------------------------------ + // other stuff - //------------------------------------------------------------------------------------ + void updateFilterUI(); - //------------------------------------------------------------------------------------ + // Type definitions - //------------------------------------------------------------------------------------ + enum ToggleType { AUTOEXTENSION, //but autoextension is handled differently on MacOSX PASSWORD, @@ -85,9 +85,9 @@ public: LIST_LAST }; - //------------------------------------------------------------------------------------ + // inline functions - //------------------------------------------------------------------------------------ + inline NSView* getUserPane() { if (m_bIsUserPaneLaidOut == false) { createUserPane(); @@ -119,9 +119,9 @@ public: } private: - //------------------------------------------------------------------------------------ + // private member variables - //------------------------------------------------------------------------------------ + /** the native view object */ NSView* m_pUserPane; @@ -165,9 +165,9 @@ private: /** the save or open panel's delegate */ AquaFilePickerDelegate *m_pDelegate; - //------------------------------------------------------------------------------------ + // private methods - //------------------------------------------------------------------------------------ + void HandleSetListValue(const NSControl* pControl, const sal_Int16 nControlAction, const uno::Any& rValue); uno::Any HandleGetListValue(const NSControl* pControl, const sal_Int16 nControlAction) const; diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm index c627d9b4c851..025639ab18d9 100644 --- a/fpicker/source/aqua/ControlHelper.mm +++ b/fpicker/source/aqua/ControlHelper.mm @@ -42,9 +42,9 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; using namespace ::rtl; #pragma mark Constructor / Destructor -//------------------------------------------------------------------------------------ + // Constructor / Destructor -//------------------------------------------------------------------------------------ + ControlHelper::ControlHelper() : m_pUserPane(NULL) , m_pFilterControl(nil) @@ -103,9 +103,9 @@ ControlHelper::~ControlHelper() } #pragma mark XInitialization delegate -//------------------------------------------------ + // XInitialization delegate -//------------------------------------------------ + void ControlHelper::initialize( sal_Int16 nTemplateId ) { DBG_PRINT_ENTRY(CLASS_NAME, __func__, "templateId", nTemplateId); @@ -153,9 +153,9 @@ void ControlHelper::initialize( sal_Int16 nTemplateId ) } #pragma mark XFilePickerControlAccess delegates -//------------------------------------------------------------------------------------ + // XFilePickerControlAccess functions -//------------------------------------------------------------------------------------ + void ControlHelper::enableControl( const sal_Int16 nControlId, const sal_Bool bEnable ) const { @@ -466,9 +466,9 @@ void ControlHelper::createUserPane() } #pragma mark Private / Misc -//------------------------------------------------------------------------------------ + // Private / Misc -//------------------------------------------------------------------------------------ + void ControlHelper::createControls() { DBG_PRINT_ENTRY(CLASS_NAME, __func__); diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm index 337173058777..41327831322e 100644 --- a/fpicker/source/aqua/FilterHelper.mm +++ b/fpicker/source/aqua/FilterHelper.mm @@ -34,7 +34,7 @@ #define CLASS_NAME "FilterEntry" #pragma mark FilterEntry -//--------------------------------------------------------------------- + FilterEntry::FilterEntry( const rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters ) :m_sTitle( _rTitle ) ,m_aSubFilters( _rSubFilters ) @@ -43,7 +43,7 @@ FilterEntry::FilterEntry( const rtl::OUString& _rTitle, const UnoFilterList& _rS DBG_PRINT_EXIT(CLASS_NAME, __func__); } -//--------------------------------------------------------------------- + sal_Bool FilterEntry::hasSubFilters() const { // OSL_TRACE(">>> FilterEntry::%s", __func__); @@ -52,7 +52,7 @@ sal_Bool FilterEntry::hasSubFilters() const return bReturn; } -//--------------------------------------------------------------------- + sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList ) { DBG_PRINT_ENTRY(CLASS_NAME, __func__); @@ -89,7 +89,7 @@ isFilterString( const rtl::OUString& rFilterString, const char *pMatch ) return bIsFilter; } -//===================================================================== + static rtl::OUString shrinkFilterName( const rtl::OUString aFilterName, bool bAllowNoStar = false ) @@ -121,9 +121,9 @@ shrinkFilterName( const rtl::OUString aFilterName, bool bAllowNoStar = false ) return aRealName; } -//------------------------------------------------------------------------------------ + namespace { - //................................................................................ + struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > { protected: @@ -132,7 +132,7 @@ protected: public: FilterTitleMatch( const rtl::OUString _rTitle ) : rTitle( _rTitle ) { } - //............................................................................ + bool operator () ( const FilterEntry& _rEntry ) { sal_Bool bMatch; @@ -202,7 +202,7 @@ FilterHelper::~FilterHelper() DBG_PRINT_EXIT(CLASS_NAME, __func__); } -//------------------------------------------------------------------------------------ + sal_Bool FilterHelper::FilterNameExists( const rtl::OUString rTitle ) { sal_Bool bRet = sal_False; @@ -218,7 +218,7 @@ sal_Bool FilterHelper::FilterNameExists( const rtl::OUString rTitle ) return bRet; } -//------------------------------------------------------------------------------------ + sal_Bool FilterHelper::FilterNameExists( const UnoFilterList& _rGroupedFilters ) { sal_Bool bRet = sal_False; @@ -240,7 +240,7 @@ sal_Bool FilterHelper::FilterNameExists( const UnoFilterList& _rGroupedFilters ) return bRet; } -//------------------------------------------------------------------------------------ + void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter ) { //OSL_TRACE(">>> FilterHelper::%s", __func__); diff --git a/fpicker/source/aqua/SalAquaFilePicker.hxx b/fpicker/source/aqua/SalAquaFilePicker.hxx index d0bda1f3258a..a9861769a98f 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.hxx +++ b/fpicker/source/aqua/SalAquaFilePicker.hxx @@ -33,17 +33,17 @@ #include "FilterHelper.hxx" #include "AquaFilePickerDelegate.hxx" -//---------------------------------------------------------- + // Implementation class for the XFilePicker Interface -//---------------------------------------------------------- -//---------------------------------------------------------- + + // forward declarations -//---------------------------------------------------------- -//---------------------------------------------------------- + + // class declaration -//---------------------------------------------------------- + typedef ::cppu::WeakComponentImplHelper4 < ::com::sun::star::ui::dialogs::XFilePicker3, @@ -60,18 +60,18 @@ public: // constructor SalAquaFilePicker(); - //------------------------------------------------------------------------------------ + // XFilePickerNotifier - //------------------------------------------------------------------------------------ + virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); @@ -79,9 +79,9 @@ public: virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePicker functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); @@ -99,9 +99,9 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilterManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -112,16 +112,16 @@ public: virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilterGroupManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XFilePickerControlAccess functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::uno::RuntimeException); @@ -138,31 +138,31 @@ public: virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XInitialization - //------------------------------------------------ + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XCancellable - //------------------------------------------------ + virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XEventListener - //------------------------------------------------ + using cppu::WeakComponentImplHelperBase::disposing; virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XServiceInfo - //------------------------------------------------ + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); @@ -173,9 +173,9 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // FilePicker Event functions - //------------------------------------------------------------------------------------ + void SAL_CALL fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm index bc244b95cf67..0d62482ff561 100644 --- a/fpicker/source/aqua/SalAquaFilePicker.mm +++ b/fpicker/source/aqua/SalAquaFilePicker.mm @@ -53,9 +53,9 @@ #define CLASS_NAME "SalAquaFilePicker" -//------------------------------------------------------------------------ + // namespace directives -//------------------------------------------------------------------------ + using namespace ::com::sun::star; using namespace ::com::sun::star::ui::dialogs; @@ -66,9 +66,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + namespace { @@ -83,9 +83,9 @@ namespace } #pragma mark Constructor -//----------------------------------------------------------------------------------------- + // constructor -//----------------------------------------------------------------------------------------- + SalAquaFilePicker::SalAquaFilePicker() : SalAquaFilePicker_Base( m_rbHelperMtx ) @@ -113,9 +113,9 @@ SalAquaFilePicker::~SalAquaFilePicker() #pragma mark XFilePickerNotifier -//------------------------------------------------------------------------------------ + // XFilePickerNotifier -//------------------------------------------------------------------------------------ + void SAL_CALL SalAquaFilePicker::addFilePickerListener( const uno::Reference<XFilePickerListener>& xListener ) throw( uno::RuntimeException ) @@ -140,9 +140,9 @@ void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference< } #pragma mark XAsynchronousExecutableDialog -//----------------------------------------------------------------------------------------- + // XExecutableDialog functions -//----------------------------------------------------------------------------------------- + void SAL_CALL SalAquaFilePicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException ) { DBG_PRINT_ENTRY(CLASS_NAME, __func__, "title", aTitle); @@ -241,9 +241,9 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() throw( uno::RuntimeException ) #pragma mark XFilePicker -//----------------------------------------------------------------------------------------- + // XFilePicker functions -//----------------------------------------------------------------------------------------- + void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( uno::RuntimeException ) { @@ -383,9 +383,9 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles() throw( uno:: } #pragma mark XFilterManager -//----------------------------------------------------------------------------------------- + // XFilterManager functions -//----------------------------------------------------------------------------------------- + void SAL_CALL SalAquaFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter ) throw( lang::IllegalArgumentException, uno::RuntimeException ) @@ -431,9 +431,9 @@ rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter() throw( uno::Runtime } #pragma mark XFilterGroupManager -//----------------------------------------------------------------------------------------- + // XFilterGroupManager functions -//----------------------------------------------------------------------------------------- + void SAL_CALL SalAquaFilePicker::appendFilterGroup( const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters ) throw( lang::IllegalArgumentException, uno::RuntimeException ) @@ -448,9 +448,9 @@ throw( lang::IllegalArgumentException, uno::RuntimeException ) } #pragma mark XFilePickerControlAccess -//------------------------------------------------------------------------------------ + // XFilePickerControlAccess functions -//------------------------------------------------------------------------------------ + void SAL_CALL SalAquaFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const uno::Any& rValue ) throw( uno::RuntimeException ) @@ -512,9 +512,9 @@ throw( uno::RuntimeException ) } #pragma mark XInitialization -//------------------------------------------------------------------------------------ + // XInitialization -//------------------------------------------------------------------------------------ + void SAL_CALL SalAquaFilePicker::initialize( const uno::Sequence<uno::Any>& aArguments ) throw( uno::Exception, uno::RuntimeException ) @@ -599,9 +599,9 @@ throw( uno::Exception, uno::RuntimeException ) } #pragma mark XCancellable -//------------------------------------------------------------------------------------ + // XCancellable -//------------------------------------------------------------------------------------ + void SAL_CALL SalAquaFilePicker::cancel() throw( uno::RuntimeException ) { @@ -617,9 +617,9 @@ void SAL_CALL SalAquaFilePicker::cancel() throw( uno::RuntimeException ) } #pragma mark XEventListener -//------------------------------------------------ + // XEventListener -//------------------------------------------------ + void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) throw( uno::RuntimeException ) { @@ -636,9 +636,9 @@ void SAL_CALL SalAquaFilePicker::disposing( const lang::EventObject& aEvent ) th } #pragma mark XServiceInfo -// ------------------------------------------------- + // XServiceInfo -// ------------------------------------------------- + rtl::OUString SAL_CALL SalAquaFilePicker::getImplementationName() throw( uno::RuntimeException ) @@ -668,9 +668,9 @@ throw( uno::RuntimeException ) } #pragma mark Misc/Private -//----------------------------------------------------------------------------------------- + // FilePicker Event functions -//----------------------------------------------------------------------------------------- + void SAL_CALL SalAquaFilePicker::fileSelectionChanged( FilePickerEvent aEvent ) { @@ -700,9 +700,9 @@ void SAL_CALL SalAquaFilePicker::dialogSizeChanged() m_xListener->dialogSizeChanged(); } -//-------------------------------------------------- + // Misc -//------------------------------------------------- + void SalAquaFilePicker::ensureFilterHelper() { DBG_PRINT_ENTRY(CLASS_NAME, __func__); diff --git a/fpicker/source/aqua/SalAquaFolderPicker.hxx b/fpicker/source/aqua/SalAquaFolderPicker.hxx index 1849fee82563..699291ddd680 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.hxx +++ b/fpicker/source/aqua/SalAquaFolderPicker.hxx @@ -31,9 +31,9 @@ #include <rtl/ustring.hxx> -//---------------------------------------------------------- + // class declaration -//---------------------------------------------------------- + class SalAquaFolderPicker : public SalAquaPicker, @@ -47,9 +47,9 @@ public: // constructor SalAquaFolderPicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceMgr ); - //------------------------------------------------------------------------------------ + // XExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); @@ -57,9 +57,9 @@ public: virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFolderPicker functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); @@ -73,9 +73,9 @@ public: virtual void SAL_CALL setDescription( const OUString& rDescription ) throw( com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XServiceInfo - //------------------------------------------------ + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); @@ -86,16 +86,16 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XCancellable - //------------------------------------------------ + virtual void SAL_CALL cancel( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XEventListener - //------------------------------------------------ + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm index 1b147d1fc514..31cd0e16e8e0 100644 --- a/fpicker/source/aqua/SalAquaFolderPicker.mm +++ b/fpicker/source/aqua/SalAquaFolderPicker.mm @@ -45,9 +45,9 @@ #pragma mark DEFINES #define CLASS_NAME "SalAquaFolderPicker" -//------------------------------------------------------------------------ + // namespace directives -//------------------------------------------------------------------------ + using namespace ::rtl; using namespace ::com::sun::star; @@ -55,9 +55,9 @@ using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; -//------------------------------------------------------------------------ + // helper functions -//------------------------------------------------------------------------ + namespace { @@ -71,9 +71,9 @@ namespace } } -//----------------------------------------------------------------------------------------- + // constructor -//----------------------------------------------------------------------------------------- + SalAquaFolderPicker::SalAquaFolderPicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr ) : m_xServiceMgr( xServiceMgr ) { @@ -84,9 +84,9 @@ SalAquaFolderPicker::SalAquaFolderPicker( const uno::Reference<lang::XMultiServi DBG_PRINT_EXIT(CLASS_NAME, __func__); } -//----------------------------------------------------------------------------------------- + // XExecutableDialog functions -//----------------------------------------------------------------------------------------- + void SAL_CALL SalAquaFolderPicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException ) { @@ -130,9 +130,9 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute() throw( uno::RuntimeException ) return retVal; } -//------------------------------------------------------------------------------------ + // XFolderPicker functions -//------------------------------------------------------------------------------------ + void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const rtl::OUString& aDirectory ) throw( lang::IllegalArgumentException, uno::RuntimeException ) @@ -202,9 +202,9 @@ void SAL_CALL SalAquaFolderPicker::setDescription( const rtl::OUString& rDescrip DBG_PRINT_EXIT(CLASS_NAME, __func__); } -// ------------------------------------------------- + // XServiceInfo -// ------------------------------------------------- + rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName() throw( uno::RuntimeException ) @@ -233,9 +233,9 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNa return FolderPicker_getSupportedServiceNames(); } -//------------------------------------------------------------------------------------ + // XCancellable -//------------------------------------------------------------------------------------ + void SAL_CALL SalAquaFolderPicker::cancel() throw( uno::RuntimeException ) { @@ -248,9 +248,9 @@ void SAL_CALL SalAquaFolderPicker::cancel() throw( uno::RuntimeException ) DBG_PRINT_EXIT(CLASS_NAME, __func__); } -// ------------------------------------------------- + // XEventListener -// ------------------------------------------------- + void SAL_CALL SalAquaFolderPicker::disposing( const lang::EventObject& ) throw( uno::RuntimeException ) diff --git a/fpicker/source/aqua/SalAquaPicker.hxx b/fpicker/source/aqua/SalAquaPicker.hxx index ca532149807b..dff3fed90644 100644 --- a/fpicker/source/aqua/SalAquaPicker.hxx +++ b/fpicker/source/aqua/SalAquaPicker.hxx @@ -33,9 +33,9 @@ #import <Cocoa/Cocoa.h> #include <postmac.h> -//---------------------------------------------------------- + // class declaration -//---------------------------------------------------------- + class SalAquaPicker { diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm index 5b155fac34e8..664088fa2fe0 100644 --- a/fpicker/source/aqua/SalAquaPicker.mm +++ b/fpicker/source/aqua/SalAquaPicker.mm @@ -42,9 +42,9 @@ #define CLASS_NAME "SalAquaPicker" #define kSetHideExtensionStateKey @"NSNavLastUserSetHideExtensionButtonState" -//------------------------------------------------------------------------ + // namespace directives -//------------------------------------------------------------------------ + using namespace ::rtl; using namespace ::com::sun::star; diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm index 32b5772bc25f..d80f2f6e8b89 100644 --- a/fpicker/source/aqua/resourceprovider.mm +++ b/fpicker/source/aqua/resourceprovider.mm @@ -31,24 +31,24 @@ #include "resourceprovider.hxx" -//------------------------------------------------------------ + // namespace directives -//------------------------------------------------------------ + using rtl::OUString; using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; -//------------------------------------------------------------ -// -//------------------------------------------------------------ + + + static const char* RES_NAME = "fps_office"; static const char* OTHER_RES_NAME = "svt"; -//------------------------------------------------------------ + // we have to translate control ids to resource ids -//------------------------------------------------------------ + struct _Entry { @@ -84,9 +84,9 @@ _Entry OtherCtrlIdToResIdTable[] = { const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable ); const sal_Int32 OTHER_SIZE_TABLE = SAL_N_ELEMENTS( OtherCtrlIdToResIdTable ); -//------------------------------------------------------------ -// -//------------------------------------------------------------ + + + sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) { @@ -120,17 +120,17 @@ sal_Int16 OtherCtrlIdToResId( sal_Int32 aControlId ) return aResId; } -//------------------------------------------------------------ -// -//------------------------------------------------------------ + + + class CResourceProvider_Impl { public: - //------------------------------------- - // - //------------------------------------- + + + CResourceProvider_Impl( ) { @@ -138,9 +138,9 @@ public: m_OtherResMgr = ResMgr::CreateResMgr( OTHER_RES_NAME ); } - //------------------------------------- - // - //------------------------------------- + + + ~CResourceProvider_Impl( ) { @@ -148,9 +148,9 @@ public: delete m_OtherResMgr; } - //------------------------------------- - // - //------------------------------------- + + + NSString* getResString( sal_Int16 aId ) { @@ -186,27 +186,27 @@ public: ResMgr* m_OtherResMgr; }; -//------------------------------------------------------------ -// -//------------------------------------------------------------ + + + CResourceProvider::CResourceProvider( ) : m_pImpl( new CResourceProvider_Impl() ) { } -//------------------------------------------------------------ -// -//------------------------------------------------------------ + + + CResourceProvider::~CResourceProvider( ) { delete m_pImpl; } -//------------------------------------------------------------ -// -//------------------------------------------------------------ + + + NSString* CResourceProvider::getResString( sal_Int32 aId ) { diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index d7518de9a46b..90f23d6edc1f 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -30,10 +30,10 @@ #include <algorithm> #include <functional> -//......................................................................... + namespace svt { -//......................................................................... + // helper ------------------------------------------------------------- @@ -59,7 +59,7 @@ namespace svt #define PROPERTY_FLAG_CHECKED 0x00000080 - // ................................................................ + struct ControlDescription { const sal_Char* pControlName; @@ -67,11 +67,11 @@ namespace svt sal_Int32 nPropertyFlags; }; - // ................................................................ + typedef const ControlDescription* ControlDescIterator; typedef ::std::pair< ControlDescIterator, ControlDescIterator > ControlDescRange; - // ...................................................................... + #define PROPERTY_FLAGS_COMMON ( PROPERTY_FLAG_ENDBALED | PROPERTY_FLAG_VISIBLE | PROPERTY_FLAG_HELPURL ) #define PROPERTY_FLAGS_LISTBOX ( PROPERTY_FLAG_LISTITEMS | PROPERTY_FLAG_SELECTEDITEM | PROPERTY_FLAG_SELECTEDITEMINDEX ) #define PROPERTY_FLAGS_CHECKBOX ( PROPERTY_FLAG_CHECKED | PROPERTY_FLAG_TEXT ) @@ -106,13 +106,13 @@ namespace svt { "VersionListLabel", LISTBOX_VERSION_LABEL, PROPERTY_FLAGS_COMMON | PROPERTY_FLAG_TEXT } }; - // ................................................................ + static const sal_Int32 s_nControlCount = sizeof( aDescriptions ) / sizeof( aDescriptions[0] ); static ControlDescIterator s_pControls = aDescriptions; static ControlDescIterator s_pControlsEnd = aDescriptions + s_nControlCount; - // ................................................................ + struct ControlDescriptionLookup { bool operator()( const ControlDescription& _rDesc1, const ControlDescription& _rDesc2 ) @@ -122,7 +122,7 @@ namespace svt }; - // ................................................................ + struct ControlProperty { const sal_Char* pPropertyName; @@ -131,7 +131,7 @@ namespace svt typedef const ControlProperty* ControlPropertyIterator; - // ................................................................ + static const ControlProperty aProperties[] = { { "Text", PROPERTY_FLAG_TEXT }, { "Enabled", PROPERTY_FLAG_ENDBALED }, @@ -143,13 +143,13 @@ namespace svt { "Checked", PROPERTY_FLAG_CHECKED } }; - // ................................................................ + static const int s_nPropertyCount = sizeof( aProperties ) / sizeof( aProperties[0] ); static ControlPropertyIterator s_pProperties = aProperties; static ControlPropertyIterator s_pPropertiesEnd = aProperties + s_nPropertyCount; - // ................................................................ + struct ControlPropertyLookup { OUString m_sLookup; @@ -765,8 +765,8 @@ namespace svt return aReturn; } -//......................................................................... + } // namespace svt -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx index ac472e777add..c5b03d436266 100644 --- a/fpicker/source/office/OfficeControlAccess.hxx +++ b/fpicker/source/office/OfficeControlAccess.hxx @@ -25,12 +25,12 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include "pickercallbacks.hxx" -//......................................................................... + namespace svt { -//......................................................................... - // -------------------------------------------------------------------- + + namespace InternalFilePickerElementIds { static const sal_Int16 PUSHBUTTON_HELP = (sal_Int16)0x1000; @@ -40,7 +40,7 @@ namespace svt static const sal_Int16 FIXEDTEXT_CURRENTFOLDER = (sal_Int16)0x1004; } - // -------------------------------------------------------------------- + /** implements the XControlAccess, XControlInformation and XFilePickerControlAccess for the file picker */ class OControlAccess @@ -109,9 +109,9 @@ namespace svt }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // SVTOOLS_CONTROLACCESS_HXX diff --git a/fpicker/source/office/OfficeFilePicker.cxx b/fpicker/source/office/OfficeFilePicker.cxx index 5c6bbfabfc31..6361f50f4dd1 100644 --- a/fpicker/source/office/OfficeFilePicker.cxx +++ b/fpicker/source/office/OfficeFilePicker.cxx @@ -53,9 +53,9 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::awt; using namespace ::utl; -//===================================================================== -//===================================================================== + + struct FilterEntry { @@ -91,7 +91,7 @@ public: const UnoFilterEntry* endSubFilters() const { return m_aSubFilters.getConstArray() + m_aSubFilters.getLength(); } }; -//===================================================================== + FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters ) @@ -340,7 +340,7 @@ void SvtFilePicker::notify( sal_Int16 _nEventId, sal_Int16 _nControlId ) namespace { - //................................................................................ + struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool > { protected: @@ -349,7 +349,7 @@ namespace { public: FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { } - //............................................................................ + bool operator () ( const FilterEntry& _rEntry ) { sal_Bool bMatch; diff --git a/fpicker/source/office/OfficeFilePicker.hxx b/fpicker/source/office/OfficeFilePicker.hxx index 88ea346e5162..2f357d886cf5 100644 --- a/fpicker/source/office/OfficeFilePicker.hxx +++ b/fpicker/source/office/OfficeFilePicker.hxx @@ -86,33 +86,33 @@ public: SvtFilePicker( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); virtual ~SvtFilePicker(); - //------------------------------------------------------------------------------------ + // disambiguate XInterface - //------------------------------------------------------------------------------------ + DECLARE_XINTERFACE( ) - //------------------------------------------------------------------------------------ + // disambiguate XTypeProvider - //------------------------------------------------------------------------------------ + DECLARE_XTYPEPROVIDER( ) - //------------------------------------------------------------------------------------ + // XExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XAsynchronousExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception); - //------------------------------------------------------------------------------------ + // XFilePicker functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setDefaultName( const OUString& aName ) throw( ::com::sun::star::uno::RuntimeException ); @@ -120,9 +120,9 @@ public: virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePickerControlAccess functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setValue( sal_Int16 ElementID, sal_Int16 ControlAction, const com::sun::star::uno::Any& value ) throw( ::com::sun::star::uno::RuntimeException ); virtual com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 ElementID, sal_Int16 ControlAction ) throw( ::com::sun::star::uno::RuntimeException ); @@ -130,16 +130,16 @@ public: virtual OUString SAL_CALL getLabel( sal_Int16 ElementID ) throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL enableControl( sal_Int16 ElementID, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePickerNotifier functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw ( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePreview functions - //------------------------------------------------------------------------------------ + virtual com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats() throw ( ::com::sun::star::uno::RuntimeException ); virtual sal_Int32 SAL_CALL getTargetColorDepth() throw ( ::com::sun::star::uno::RuntimeException ); @@ -149,23 +149,23 @@ public: virtual sal_Bool SAL_CALL setShowState( sal_Bool bShowState ) throw ( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool SAL_CALL getShowState() throw ( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilterManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setCurrentFilter( const OUString& aTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilterGroupManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const com::sun::star::uno::Sequence< com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // these methods are here because they're ambiguous - //------------------------------------------------------------------------------------ + virtual void SAL_CALL cancel() throw( ::com::sun::star::uno::RuntimeException ) { ::svt::OCommonPicker::cancel(); } virtual void SAL_CALL dispose() throw( ::com::sun::star::uno::RuntimeException ) @@ -175,15 +175,15 @@ public: virtual void SAL_CALL removeEventListener(const com::sun::star::uno::Reference<com::sun::star::lang::XEventListener>& l) throw( ::com::sun::star::uno::RuntimeException ) { ::svt::OCommonPicker::removeEventListener(l); } - //------------------------------------------------------------------------------------ + // XInitialization functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments ) throw ( com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XServiceInfo functions - //------------------------------------------------------------------------------------ + /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); @@ -202,9 +202,9 @@ public: throw( com::sun::star::uno::Exception ); protected: - //------------------------------------------------------------------------------------ + // OCommonPicker overridables - //------------------------------------------------------------------------------------ + virtual SvtFileDialog* implCreateDialog( Window* _pParent ); virtual sal_Int16 implExecutePicker( ); virtual sal_Bool implHandleInitializationArgument( diff --git a/fpicker/source/office/OfficeFolderPicker.hxx b/fpicker/source/office/OfficeFolderPicker.hxx index 3a58209cf66e..a33bb586718a 100644 --- a/fpicker/source/office/OfficeFolderPicker.hxx +++ b/fpicker/source/office/OfficeFolderPicker.hxx @@ -52,9 +52,9 @@ public: SvtFolderPicker( const ::com::sun::star::uno::Reference < ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); virtual ~SvtFolderPicker(); - //------------------------------------------------------------------------------------ + // XFolderPicker2 functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException ); @@ -64,21 +64,21 @@ public: virtual void SAL_CALL cancel() throw (com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XAsynchronousExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setDialogTitle( const OUString& _rTitle ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL startExecuteModal( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XDialogClosedListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XServiceInfo functions - //------------------------------------------------------------------------------------ + /* XServiceInfo */ virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); @@ -96,9 +96,9 @@ public: throw( com::sun::star::uno::Exception ); protected: - //------------------------------------------------------------------------------------ + // OCommonPicker overridables - //------------------------------------------------------------------------------------ + virtual SvtFileDialog* implCreateDialog( Window* _pParent ); virtual sal_Int16 implExecutePicker( ); }; diff --git a/fpicker/source/office/asyncfilepicker.cxx b/fpicker/source/office/asyncfilepicker.cxx index d2763257d25b..d4c52416ac2d 100644 --- a/fpicker/source/office/asyncfilepicker.cxx +++ b/fpicker/source/office/asyncfilepicker.cxx @@ -25,14 +25,14 @@ #include <boost/scoped_ptr.hpp> -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= AsyncPickerAction - //==================================================================== + DBG_NAME( AsyncPickerAction ) AsyncPickerAction::AsyncPickerAction( SvtFileDialog* _pDialog, SvtFileView* _pView, const Action _eAction ) @@ -204,8 +204,8 @@ namespace svt return 1L; } -//........................................................................ + } // namespace svt -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/asyncfilepicker.hxx b/fpicker/source/office/asyncfilepicker.hxx index f595c0b916bd..1b19e8ace475 100644 --- a/fpicker/source/office/asyncfilepicker.hxx +++ b/fpicker/source/office/asyncfilepicker.hxx @@ -30,15 +30,15 @@ class SvtFileDialog; typedef ::com::sun::star::uno::Sequence< OUString > OUStringList; -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= AsyncPickerAction - //==================================================================== + class AsyncPickerAction : public ::rtl::IReference { public: @@ -98,9 +98,9 @@ namespace svt AsyncPickerAction& operator=( const AsyncPickerAction& ); // never implemented }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // SVTOOLS_SOURCE_FILEPICKER_ASYNCFILEPICKER_HXX diff --git a/fpicker/source/office/commonpicker.cxx b/fpicker/source/office/commonpicker.cxx index 3602918efc28..356c87959ea8 100644 --- a/fpicker/source/office/commonpicker.cxx +++ b/fpicker/source/office/commonpicker.cxx @@ -29,10 +29,10 @@ #include <vcl/msgbox.hxx> #include "iodlg.hxx" -//......................................................................... + namespace svt { -//......................................................................... + #define PROPERTY_ID_HELPURL 1 #define PROPERTY_ID_WINDOW 2 @@ -384,7 +384,7 @@ namespace svt // is either handled in the thread which opened the dialog (which may even be // this thread here), or, if no dialog is open, in the thread doing scheduling // currently. Both is okay for us .... - // + // Note that we could do check if we are really executing the dialog currently. // but the information would be potentially obsolete at the moment our event // arrives, so we need to check it there, anyway ... @@ -490,8 +490,8 @@ namespace svt return bKnown; } -//......................................................................... + } // namespace svt -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/commonpicker.hxx b/fpicker/source/office/commonpicker.hxx index 5008f68055cc..576f377c546b 100644 --- a/fpicker/source/office/commonpicker.hxx +++ b/fpicker/source/office/commonpicker.hxx @@ -37,10 +37,10 @@ class SvtFileDialog; class Window; -//......................................................................... + namespace svt { -//......................................................................... + typedef ::cppu::WeakComponentImplHelper5 < ::com::sun::star::ui::dialogs::XControlAccess , ::com::sun::star::ui::dialogs::XControlInformation @@ -97,29 +97,29 @@ namespace svt // do NOT override XExecutableDialog::execute! We need to do some stuff there ourself ... protected: - //------------------------------------------------------------------------------------ + // disambiguate XInterface - //------------------------------------------------------------------------------------ + DECLARE_XINTERFACE( ) - //------------------------------------------------------------------------------------ + // disambiguate XTypeProvider - //------------------------------------------------------------------------------------ + DECLARE_XTYPEPROVIDER( ) - //------------------------------------------------------------------------------------ + // ComponentHelper/XComponent - //------------------------------------------------------------------------------------ + virtual void SAL_CALL disposing(); - //------------------------------------------------------------------------------------ + // XEventListner - //------------------------------------------------------------------------------------ + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // property set related methods - //------------------------------------------------------------------------------------ + // XPropertySet pure methods virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -132,40 +132,40 @@ namespace svt virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const ::com::sun::star::uno::Any& _rValue ) throw (::com::sun::star::uno::Exception); - //------------------------------------------------------------------------------------ + // XExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& _rTitle ) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XControlAccess functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setControlProperty( const OUString& aControlName, const OUString& aControlProperty, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getControlProperty( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XControlInformation functions - //------------------------------------------------------------------------------------ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControls( ) throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isControlSupported( const OUString& aControlName ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedControlProperties( const OUString& aControlName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isControlPropertySupported( const OUString& aControlName, const OUString& aControlProperty ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XCancellable functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL cancel( ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XInitialization functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw ( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // misc - //------------------------------------------------------------------------------------ + void checkAlive() const SAL_THROW( (::com::sun::star::lang::DisposedException) ); void prepareDialog(); @@ -188,9 +188,9 @@ namespace svt DECL_LINK( OnCancelPicker, void* ); }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // SVTOOLS_COMMONPICKER_HXX diff --git a/fpicker/source/office/fpinteraction.cxx b/fpicker/source/office/fpinteraction.cxx index 6072f11fbe37..c4cd1db4c00c 100644 --- a/fpicker/source/office/fpinteraction.cxx +++ b/fpicker/source/office/fpinteraction.cxx @@ -25,17 +25,17 @@ #include <com/sun/star/task/XInteractionDisapprove.hpp> #include <com/sun/star/task/XInteractionRetry.hpp> -//........................................................................ + namespace svt { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; using namespace ::com::sun::star::ucb; - //==================================================================== + //= OFilePickerInteractionHandler - //==================================================================== + DBG_NAME( OFilePickerInteractionHandler ) OFilePickerInteractionHandler::OFilePickerInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxMaster ) @@ -153,8 +153,8 @@ namespace svt return sal_False; } -//........................................................................ + } // namespace svt -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/fpinteraction.hxx b/fpicker/source/office/fpinteraction.hxx index d8bdc199fc35..a74305c8e573 100644 --- a/fpicker/source/office/fpinteraction.hxx +++ b/fpicker/source/office/fpinteraction.hxx @@ -23,14 +23,14 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/task/XInteractionHandler.hpp> -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= OFilePickerInteractionHandler - //==================================================================== + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionHandler > OFilePickerInteractionHandler_Base; @@ -76,9 +76,9 @@ namespace svt ~OFilePickerInteractionHandler(); }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // SVTOOLS_FILEPICKER_INTERACTION_HXX diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index e12a4a91ed47..33a8f99c83a9 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -30,10 +30,10 @@ #include <tools/solar.h> #include <tools/debug.hxx> -//........................................................................ + namespace svt { -//........................................................................ + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; @@ -41,9 +41,9 @@ namespace svt using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; - //==================================================================== + //= SmartContent - //==================================================================== + SmartContent::SmartContent() :m_pContent( NULL ) @@ -341,8 +341,8 @@ namespace svt return aCreatedUrl; } -//........................................................................ + } // namespace svt -//........................................................................ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/fpicker/source/office/fpsmartcontent.hxx b/fpicker/source/office/fpsmartcontent.hxx index 07c5d0393b0d..658f5038048c 100644 --- a/fpicker/source/office/fpsmartcontent.hxx +++ b/fpicker/source/office/fpsmartcontent.hxx @@ -26,14 +26,14 @@ #include <com/sun/star/task/XInteractionHandler.hpp> #include <ucbhelper/content.hxx> -//........................................................................ + namespace svt { -//........................................................................ - //==================================================================== + + //= SmartContent - //==================================================================== + /** a "smart content" which basically wraps an UCB content, but caches some information so that repeatedly recreating it may be faster */ @@ -202,9 +202,9 @@ namespace svt inline sal_Bool is( ) { return is( getURL() ); } }; -//........................................................................ + } // namespace svt -//........................................................................ + #endif // SVTOOLS_SOURCE_FILEPICKER_FPSMARTCONTENT_HXX diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 2a643856db66..e850f7df3565 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -270,7 +270,7 @@ namespace _rHomeDir = ""; // now ask the content broker for a provider for this scheme - //================================================================= + try { // get the provider for the current scheme @@ -321,9 +321,9 @@ namespace } } -//*************************************************************************** + // ControlChain_Impl -//*************************************************************************** + struct ControlChain_Impl { @@ -335,7 +335,7 @@ struct ControlChain_Impl ~ControlChain_Impl(); }; -//*************************************************************************** + ControlChain_Impl::ControlChain_Impl ( @@ -348,7 +348,7 @@ ControlChain_Impl::ControlChain_Impl { } -//*************************************************************************** + ControlChain_Impl::~ControlChain_Impl() { @@ -359,9 +359,9 @@ ControlChain_Impl::~ControlChain_Impl() delete _pNext; } -//***************************************************************************** + // SvtFileDialog -//***************************************************************************** + SvtFileDialog::SvtFileDialog ( Window* _pParent, @@ -390,7 +390,7 @@ SvtFileDialog::SvtFileDialog Init_Impl( nBits ); } -//***************************************************************************** + SvtFileDialog::SvtFileDialog ( Window* _pParent, WinBits nBits ) :ModalDialog( _pParent, SvtResId( DLG_FPICKER_EXPLORERFILE ) ) @@ -412,7 +412,7 @@ SvtFileDialog::SvtFileDialog ( Window* _pParent, WinBits nBits ) Init_Impl( nBits ); } -//***************************************************************************** + SvtFileDialog::~SvtFileDialog() { @@ -463,7 +463,7 @@ SvtFileDialog::~SvtFileDialog() delete _pUserControls; } -//***************************************************************************** + void SvtFileDialog::Init_Impl ( @@ -765,7 +765,7 @@ void SvtFileDialog::Init_Impl ); } -//***************************************************************************** + IMPL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, EMPTYARG ) { @@ -795,7 +795,7 @@ IMPL_STATIC_LINK( SvtFileDialog, NewFolderHdl_Impl, PushButton*, EMPTYARG ) return 0; } -//***************************************************************************** + IMPL_STATIC_LINK_NOINSTANCE( SvtFileDialog, ViewHdl_Impl, ImageButton*, EMPTYARG ) { @@ -1241,14 +1241,14 @@ IMPL_STATIC_LINK( SvtFileDialog, OpenHdl_Impl, void*, pVoid ) return nRet; } -//***************************************************************************** + void SvtFileDialog::EnableAutocompletion( sal_Bool _bEnable ) { _pImp->_pEdFileName->EnableAutocompletion( _bEnable ); } -//***************************************************************************** + IMPL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, ListBox*, pBox ) { @@ -1334,7 +1334,7 @@ IMPL_STATIC_LINK( SvtFileDialog, FilterSelectHdl_Impl, ListBox*, pBox ) return 0; } -//***************************************************************************** + IMPL_STATIC_LINK( SvtFileDialog, FileNameGetFocusHdl_Impl, void*, EMPTYARG ) { @@ -1343,7 +1343,7 @@ IMPL_STATIC_LINK( SvtFileDialog, FileNameGetFocusHdl_Impl, void*, EMPTYARG ) return 0; } -//***************************************************************************** + IMPL_STATIC_LINK( SvtFileDialog, FileNameModifiedHdl_Impl, void*, EMPTYARG ) { @@ -1351,7 +1351,7 @@ IMPL_STATIC_LINK( SvtFileDialog, FileNameModifiedHdl_Impl, void*, EMPTYARG ) return 0; } -//***************************************************************************** + IMPL_STATIC_LINK ( SvtFileDialog, URLBoxModifiedHdl_Impl, void*, EMPTYARG ) { @@ -1360,7 +1360,7 @@ IMPL_STATIC_LINK ( SvtFileDialog, URLBoxModifiedHdl_Impl, void*, EMPTYARG ) return 0; } -//***************************************************************************** + IMPL_STATIC_LINK ( SvtFileDialog, ConnectToServerPressed_Hdl, void*, EMPTYARG ) { @@ -1386,7 +1386,7 @@ IMPL_STATIC_LINK ( SvtFileDialog, ConnectToServerPressed_Hdl, void*, EMPTYARG ) return 0; } -//***************************************************************************** + IMPL_LINK_NOARG ( SvtFileDialog, AddPlacePressed_Hdl ) { @@ -1400,7 +1400,7 @@ IMPL_LINK_NOARG ( SvtFileDialog, AddPlacePressed_Hdl ) return 0; } -//***************************************************************************** + IMPL_LINK_NOARG ( SvtFileDialog, RemovePlacePressed_Hdl ) { @@ -1408,7 +1408,7 @@ IMPL_LINK_NOARG ( SvtFileDialog, RemovePlacePressed_Hdl ) return 0; } -//***************************************************************************** + SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl ( @@ -1469,7 +1469,7 @@ SvtFileDialogFilter_Impl* SvtFileDialog::FindFilter_Impl return pFoundFilter; } -//***************************************************************************** + void SvtFileDialog::ExecuteFilter() { @@ -1477,7 +1477,7 @@ void SvtFileDialog::ExecuteFilter() executeAsync( AsyncPickerAction::eExecuteFilter, OUString(), getMostCurrentFilter( _pImp ) ); } -//***************************************************************************** + void SvtFileDialog::OpenMultiSelection_Impl() @@ -1505,7 +1505,7 @@ void SvtFileDialog::OpenMultiSelection_Impl() EndDialog( sal_True ); } -//***************************************************************************** + void SvtFileDialog::UpdateControls( const OUString& rURL ) { @@ -1513,7 +1513,7 @@ void SvtFileDialog::UpdateControls( const OUString& rURL ) INetURLObject aObj( rURL ); - //========================================================================= + { OUString sText; DBG_ASSERT( INET_PROT_NOT_VALID != aObj.GetProtocol(), "SvtFileDialog::UpdateControls: Invalid URL!" ); @@ -1552,13 +1552,13 @@ void SvtFileDialog::UpdateControls( const OUString& rURL ) _pImp->_pEdCurrentPath->SetText( sText ); } - //========================================================================= + _aPath = rURL; if ( _pFileNotifier ) _pFileNotifier->notify( DIRECTORY_CHANGED, 0 ); } -//***************************************************************************** + IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox ) { @@ -1612,7 +1612,7 @@ IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox ) return 0; } -//***************************************************************************** + IMPL_LINK_NOARG(SvtFileDialog, DblClickHdl_Impl) { @@ -1623,7 +1623,7 @@ IMPL_LINK_NOARG(SvtFileDialog, DblClickHdl_Impl) return 0; } -//***************************************************************************** + IMPL_LINK_NOARG(SvtFileDialog, EntrySelectHdl_Impl) { @@ -1632,7 +1632,7 @@ IMPL_LINK_NOARG(SvtFileDialog, EntrySelectHdl_Impl) return 0; } -//***************************************************************************** + IMPL_LINK( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView ) { @@ -1656,7 +1656,7 @@ IMPL_LINK( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView ) return 0; } -//***************************************************************************** + IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl) { @@ -1670,7 +1670,7 @@ IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl) return 0; } -//***************************************************************************** + IMPL_LINK( SvtFileDialog, ClickHdl_Impl, CheckBox*, pCheckBox ) { @@ -1698,7 +1698,7 @@ IMPL_LINK( SvtFileDialog, ClickHdl_Impl, CheckBox*, pCheckBox ) return 0; } -//***************************************************************************** + IMPL_LINK_NOARG(SvtFileDialog, PlayButtonHdl_Impl) { @@ -1709,7 +1709,7 @@ IMPL_LINK_NOARG(SvtFileDialog, PlayButtonHdl_Impl) return 0; } -//***************************************************************************** + bool SvtFileDialog::Notify( NotifyEvent& rNEvt ) @@ -1742,14 +1742,14 @@ bool SvtFileDialog::Notify( NotifyEvent& rNEvt ) return nRet || ModalDialog::Notify( rNEvt ); } -//***************************************************************************** + long SvtFileDialog::OK() { return sal_True; } -//***************************************************************************** + class SvtDefModalDialogParent_Impl { @@ -1764,7 +1764,7 @@ public: ~SvtDefModalDialogParent_Impl() { Application::SetDefDialogParent( _pOld ); } }; -//***************************************************************************** + void SvtFileDialog::updateListboxLabelSizes() @@ -2091,7 +2091,7 @@ short SvtFileDialog::PrepareExecute() _aPath += aFileNameOnly; } - //..................................................................... + _aPath = implGetInitialURL( _aPath, GetStandardDir() ); if ( _pImp->_nStyle & WB_SAVEAS && !m_bHasFilename ) @@ -2217,7 +2217,7 @@ void SvtFileDialog::executeAsync( ::svt::AsyncPickerAction::Action _eAction, m_bInExecuteAsync = false; } -//***************************************************************************** + void SvtFileDialog::FileSelect() { @@ -2225,7 +2225,7 @@ void SvtFileDialog::FileSelect() _pFileNotifier->notify( FILE_SELECTION_CHANGED, 0 ); } -//***************************************************************************** + void SvtFileDialog::FilterSelect() { @@ -2234,7 +2234,7 @@ void SvtFileDialog::FilterSelect() LISTBOX_FILTER ); } -//***************************************************************************** + void SvtFileDialog::SetStandardDir( const OUString& rStdDir ) @@ -2255,13 +2255,13 @@ void SvtFileDialog::SetBlackList( const ::com::sun::star::uno::Sequence< OUStrin _pImp->SetBlackList( rBlackList ); } -//***************************************************************************** + const ::com::sun::star::uno::Sequence< OUString >& SvtFileDialog::GetBlackList() const { return _pImp->GetBlackList(); } -//***************************************************************************** + const OUString& SvtFileDialog::GetStandardDir() const @@ -2274,7 +2274,7 @@ const OUString& SvtFileDialog::GetStandardDir() const return _pImp->GetStandardDir(); } -//***************************************************************************** + void SvtFileDialog::PrevLevel_Impl() { @@ -2284,7 +2284,7 @@ void SvtFileDialog::PrevLevel_Impl() executeAsync( AsyncPickerAction::ePrevLevel, sDummy, sDummy ); } -//***************************************************************************** + void SvtFileDialog::OpenURL_Impl( const OUString& _rURL ) { @@ -2293,7 +2293,7 @@ void SvtFileDialog::OpenURL_Impl( const OUString& _rURL ) executeAsync( AsyncPickerAction::eOpenURL, _rURL, getMostCurrentFilter( _pImp ) ); } -//***************************************************************************** + SvtFileDialogFilter_Impl* SvtFileDialog::implAddFilter( const OUString& _rFilter, const OUString& _rType ) { SvtFileDialogFilter_Impl* pNewFilter = new SvtFileDialogFilter_Impl( _rFilter, _rType ); @@ -2305,7 +2305,7 @@ SvtFileDialogFilter_Impl* SvtFileDialog::implAddFilter( const OUString& _rFilter return pNewFilter; } -//***************************************************************************** + void SvtFileDialog::AddFilter( const OUString& _rFilter, const OUString& _rType ) { @@ -2313,7 +2313,7 @@ void SvtFileDialog::AddFilter( const OUString& _rFilter, const OUString& _rType implAddFilter ( _rFilter, _rType ); } -//***************************************************************************** + void SvtFileDialog::AddFilterGroup( const OUString& _rFilter, const Sequence< StringPair >& _rFilters ) { DBG_ASSERT( !IsInExecute(), "SvtFileDialog::AddFilter: currently executing!" ); @@ -2344,7 +2344,7 @@ void SvtFileDialog::SetCurFilter( const OUString& rFilter ) } } -//***************************************************************************** + OUString SvtFileDialog::GetCurFilter() const { @@ -2362,14 +2362,14 @@ OUString SvtFileDialog::getCurFilter( ) const return GetCurFilter(); } -//***************************************************************************** + sal_uInt16 SvtFileDialog::GetFilterCount() const { return _pImp->_pFilter->size(); } -//***************************************************************************** + const OUString& SvtFileDialog::GetFilterName( sal_uInt16 nPos ) const { @@ -2377,7 +2377,7 @@ const OUString& SvtFileDialog::GetFilterName( sal_uInt16 nPos ) const return (*_pImp->_pFilter)[ nPos ].GetName(); } -//***************************************************************************** + void SvtFileDialog::InitSize() { @@ -2409,7 +2409,7 @@ void SvtFileDialog::InitSize() } } -//***************************************************************************** + std::vector<OUString> SvtFileDialog::GetPathList() const { @@ -2436,7 +2436,7 @@ std::vector<OUString> SvtFileDialog::GetPathList() const return aList; } -//***************************************************************************** + void SvtFileDialog::implArrangeControls() { @@ -2483,7 +2483,7 @@ void SvtFileDialog::implArrangeControls() _pImp->_pEdFileName->GrabFocus(); } -//***************************************************************************** + sal_Bool SvtFileDialog::IsolateFilterFromPath_Impl( OUString& rPath, OUString& rFilter ) { @@ -3095,7 +3095,7 @@ void SvtFileDialog::ReleaseOwnership( Window* pUserControl ) } } -//*************************************************************************** + sal_Bool SvtFileDialog::AddControl( Window* pControl, sal_Bool bNewLine ) { diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc index 73e7901bf3b2..b16bc8ebce3d 100644 --- a/fpicker/source/office/iodlg.hrc +++ b/fpicker/source/office/iodlg.hrc @@ -55,7 +55,7 @@ #define BTN_EXPLORERFILE_CONNECT_TO_SERVER 51 #define EXPLORERFILE_SPLITTER 52 -// ----------------------------------------------- + #define STR_EXPLORERFILE_OPEN 1 #define STR_EXPLORERFILE_SAVE 2 @@ -68,7 +68,7 @@ #define STR_DEFAULT_DIRECTORY 9 #define STR_PLACES_TITLE 10 -// ----------------------------------------------- + #define SID_SFX_START 5000 #define SID_OPENURL (SID_SFX_START + 596) diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 41ffff391074..45b85441f33f 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -44,14 +44,14 @@ // @@@ using namespace com::sun::star::ucb; -//***************************************************************************** + class SvTabListBox; class SvtFileView; struct ControlChain_Impl; class SvtFileDialogFilter_Impl; -//***************************************************************************** + #define SFXWB_INSERT ( 0x04000000L | WB_OPEN ) #define SFXWB_PASSWORD WB_PASSWORD @@ -75,9 +75,9 @@ class SvtFileDialogFilter_Impl; #define FILEDIALOG_FILTER_ALL "*.*" -//***************************************************************************** + // SvtFileDialog -//***************************************************************************** + class SvtExpFileDlg_Impl; class SvtFileDialog : public ModalDialog, public ::svt::IFilePickerController @@ -346,28 +346,28 @@ private: void initDefaultPlaces( ); }; -//*************************************************************************** + inline void SvtFileDialog::SetPath( const OUString& rNewURL ) { _aPath = rNewURL; } -//*************************************************************************** + inline void SvtFileDialog::SetHasFilename( bool bHasFilename ) { m_bHasFilename = bHasFilename; } -//*************************************************************************** + inline const OUString& SvtFileDialog::GetPath() const { return _aPath; } -//*************************************************************************** + inline void SvtFileDialog::SetDefaultExt( const OUString& rExt ) { @@ -384,7 +384,7 @@ inline const OUString& SvtFileDialog::GetDefaultExt() const return _aDefExt; } -//***************************************************************************** + inline void SvtFileDialog::SetOKHdl ( @@ -394,14 +394,14 @@ inline void SvtFileDialog::SetOKHdl _aOKHdl = rLink; } -//***************************************************************************** + inline const Link& SvtFileDialog::GetOKHdl() const { return _aOKHdl; } -//***************************************************************************** + inline void SvtFileDialog::SetFileSelectHdl ( @@ -411,14 +411,14 @@ inline void SvtFileDialog::SetFileSelectHdl _aFileSelectHdl = rLink; } -//***************************************************************************** + inline const Link& SvtFileDialog::GetFileSelectHdl() const { return _aFileSelectHdl; } -//***************************************************************************** + inline void SvtFileDialog::SetFilterSelectHdl ( @@ -428,23 +428,23 @@ inline void SvtFileDialog::SetFilterSelectHdl _aFilterSelectHdl = rLink; } -//***************************************************************************** + inline const Link& SvtFileDialog::GetFilterSelectHdl() const { return _aFilterSelectHdl; } -//***************************************************************************** + inline SvtFileView* SvtFileDialog::GetView() const { return _pFileView; } -//***************************************************************************** -//***************************************************************************** -//***************************************************************************** + + + #define FILE_SELECTION_CHANGED 1 #define DIRECTORY_CHANGED 2 diff --git a/fpicker/source/office/iodlgimp.cxx b/fpicker/source/office/iodlgimp.cxx index e8630a196aa4..2bc796aa9f65 100644 --- a/fpicker/source/office/iodlgimp.cxx +++ b/fpicker/source/office/iodlgimp.cxx @@ -43,9 +43,9 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::utl; -//***************************************************************************** + // ResMgrHolder / SvtSimpleResId -//***************************************************************************** + namespace { struct ResMgrHolder @@ -69,9 +69,9 @@ namespace }; } -//***************************************************************************** + // SvtFileDialogFilter_Impl -//***************************************************************************** + DBG_NAME( SvtFileDialogFilter_Impl ) SvtFileDialogFilter_Impl::SvtFileDialogFilter_Impl( const OUString& rName, const OUString& rType ) @@ -83,20 +83,20 @@ SvtFileDialogFilter_Impl::SvtFileDialogFilter_Impl( const OUString& rName, const m_aType = m_aType.toAsciiLowerCase(); } -//***************************************************************************** + SvtFileDialogFilter_Impl::~SvtFileDialogFilter_Impl() { DBG_DTOR( SvtFileDialogFilter_Impl, NULL ); } -//***************************************************************************** + // SvtFileDialogFilterList_Impl -//***************************************************************************** -//============================================================================= + + //= SvtFileDialogURLSelector -//============================================================================= + SvtFileDialogURLSelector::SvtFileDialogURLSelector( SvtFileDialog* _pParent, const ResId& _rResId, sal_uInt16 _nButtonId ) @@ -126,9 +126,9 @@ void SvtFileDialogURLSelector::Activate() SetPopupMenu( m_pMenu ); } -//============================================================================= + //= SvtUpButton_Impl -//============================================================================= + SvtUpButton_Impl::SvtUpButton_Impl( SvtFileDialog* pParent, const ResId& rResId ) @@ -204,9 +204,9 @@ void SvtUpButton_Impl::Click() GetDialogParent()->PrevLevel_Impl(); } -//***************************************************************************** + // SvtExpFileDlg_Impl -//***************************************************************************** + SvtExpFileDlg_Impl::SvtExpFileDlg_Impl( WinBits ) : @@ -247,7 +247,7 @@ SvtExpFileDlg_Impl::SvtExpFileDlg_Impl( WinBits ) : { } -//***************************************************************************** + SvtExpFileDlg_Impl::~SvtExpFileDlg_Impl() { @@ -276,7 +276,7 @@ SvtExpFileDlg_Impl::~SvtExpFileDlg_Impl() delete _pBtnConnectToServer; } -//***************************************************************************** + void SvtExpFileDlg_Impl::SetStandardDir( const OUString& _rDir ) { @@ -285,7 +285,7 @@ void SvtExpFileDlg_Impl::SetStandardDir( const OUString& _rDir ) _aStdDir = "file:///"; } -//***************************************************************************** + #if defined DBG_UTIL namespace { diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 0193db3895c3..2578e9b930e9 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -36,9 +36,9 @@ class SvtFileDialog; #define FILEDIALOG_DEF_EXTSEP ';' #define FILEDIALOG_DEF_WILDCARD '*' -//***************************************************************************** + // SvtFileDialogFilter_Impl -//***************************************************************************** + /* [Description] @@ -199,7 +199,7 @@ public: inline const OUString& GetStandardDir() const { return _aStdDir; } inline void DisableFilterBoxAutoWidth() { _pLbFilter->EnableDDAutoWidth( false ); } - // ------------------------------------------ + // access to the filter listbox only as Control* - we want to maintain the entries/userdata ourself Control* GetFilterListControl() { return _pLbFilter; } const Control* GetFilterListControl() const { return _pLbFilter; } @@ -217,7 +217,7 @@ public: inline SvtFileDialogFilter_Impl* GetSelectedFilterEntry( OUString& /* [out] */ _rDisplayName ) const; inline sal_Bool IsFilterListTravelSelect() const; - // ------------------------------------------ + // access to the current filter via methods only - need to care for consistency between _pCurFilter and m_sCurrentFilterDisplayName inline const SvtFileDialogFilter_Impl* GetCurFilter( ) const; inline const OUString& GetCurFilterDisplayName() const; diff --git a/fpicker/source/office/pickercallbacks.hxx b/fpicker/source/office/pickercallbacks.hxx index e8c19f5565f0..1981b7cabf0a 100644 --- a/fpicker/source/office/pickercallbacks.hxx +++ b/fpicker/source/office/pickercallbacks.hxx @@ -25,12 +25,12 @@ class Control; -//......................................................................... + namespace svt { -//......................................................................... - // -------------------------------------------------------------------- + + class IFilePickerController { public: @@ -42,7 +42,7 @@ namespace svt ~IFilePickerController() {} }; - // -------------------------------------------------------------------- + class IFilePickerListener { public: @@ -52,9 +52,9 @@ namespace svt ~IFilePickerListener() {} }; -//......................................................................... + } // namespace svt -//......................................................................... + #endif // SVTOOLS_PICKER_CALLBACKS_HXX diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx index d0ae05d4ae64..beb57a7846c4 100644 --- a/fpicker/source/win32/filepicker/FPentry.cxx +++ b/fpicker/source/win32/filepicker/FPentry.cxx @@ -48,7 +48,7 @@ using ::com::sun::star::ui::dialogs::XFilePicker; using ::com::sun::star::ui::dialogs::XFilePicker2; -// + static Reference< XInterface > SAL_CALL createInstance( diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.cxx b/fpicker/source/win32/filepicker/FileOpenDlg.cxx index 0898bfe608bb..46334643c86c 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.cxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.cxx @@ -66,7 +66,7 @@ namespace /* private */ }; -// + CFileOpenDialog::CFileOpenDialog( @@ -127,7 +127,7 @@ CFileOpenDialog::CFileOpenDialog( } -// + CFileOpenDialog::~CFileOpenDialog() @@ -135,7 +135,7 @@ CFileOpenDialog::~CFileOpenDialog() } -// + void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle) @@ -145,7 +145,7 @@ void SAL_CALL CFileOpenDialog::setTitle(const OUString& aTitle) } -// + void CFileOpenDialog::setFilter(const OUString& aFilter) @@ -160,7 +160,7 @@ void CFileOpenDialog::setFilter(const OUString& aFilter) } -// + bool CFileOpenDialog::setFilterIndex(sal_uInt32 aIndex) @@ -171,7 +171,7 @@ bool CFileOpenDialog::setFilterIndex(sal_uInt32 aIndex) } -// + sal_uInt32 CFileOpenDialog::getSelectedFilterIndex() const @@ -180,7 +180,7 @@ sal_uInt32 CFileOpenDialog::getSelectedFilterIndex() const } -// + void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName) @@ -191,7 +191,7 @@ void SAL_CALL CFileOpenDialog::setDefaultName(const OUString& aName) } -// + void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory) @@ -201,7 +201,7 @@ void SAL_CALL CFileOpenDialog::setDisplayDirectory(const OUString& aDirectory) } -// + OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const @@ -210,7 +210,7 @@ OUString SAL_CALL CFileOpenDialog::getLastDisplayDirectory() const } -// + OUString SAL_CALL CFileOpenDialog::getFullFileName() const @@ -220,7 +220,7 @@ OUString SAL_CALL CFileOpenDialog::getFullFileName() const } -// + OUString SAL_CALL CFileOpenDialog::getFileName() const @@ -229,7 +229,7 @@ OUString SAL_CALL CFileOpenDialog::getFileName() const } -// + OUString CFileOpenDialog::getFileExtension() @@ -242,7 +242,7 @@ OUString CFileOpenDialog::getFileExtension() } -// + void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension) @@ -252,7 +252,7 @@ void CFileOpenDialog::setDefaultFileExtension(const OUString& aExtension) } -// + void SAL_CALL CFileOpenDialog::setMultiSelectionMode(bool bMode) @@ -264,7 +264,7 @@ void SAL_CALL CFileOpenDialog::setMultiSelectionMode(bool bMode) } -// + bool SAL_CALL CFileOpenDialog::getMultiSelectionMode() const @@ -273,7 +273,7 @@ bool SAL_CALL CFileOpenDialog::getMultiSelectionMode() const } -// + sal_Int16 SAL_CALL CFileOpenDialog::doModal() @@ -305,7 +305,7 @@ sal_Int16 SAL_CALL CFileOpenDialog::doModal() } -// + sal_uInt32 SAL_CALL CFileOpenDialog::getLastDialogError() const @@ -314,7 +314,7 @@ sal_uInt32 SAL_CALL CFileOpenDialog::getLastDialogError() const } -// + bool SAL_CALL CFileOpenDialog::preModal() @@ -323,7 +323,7 @@ bool SAL_CALL CFileOpenDialog::preModal() } -// + void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult) @@ -340,7 +340,7 @@ void SAL_CALL CFileOpenDialog::postModal(sal_Int16 nDialogResult) } -// + OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const @@ -362,7 +362,7 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFilePath() const } -// + OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const @@ -384,7 +384,7 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFolderPath() const } -// + OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const @@ -406,7 +406,7 @@ OUString SAL_CALL CFileOpenDialog::getCurrentFileName() const } -// + sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const OUString&) @@ -415,7 +415,7 @@ sal_uInt32 SAL_CALL CFileOpenDialog::onShareViolation(const OUString&) } -// + sal_uInt32 SAL_CALL CFileOpenDialog::onFileOk() @@ -424,7 +424,7 @@ sal_uInt32 SAL_CALL CFileOpenDialog::onFileOk() } -// + void SAL_CALL CFileOpenDialog::onSelChanged(HWND) @@ -432,7 +432,7 @@ void SAL_CALL CFileOpenDialog::onSelChanged(HWND) } -// + void SAL_CALL CFileOpenDialog::onHelp() @@ -440,7 +440,7 @@ void SAL_CALL CFileOpenDialog::onHelp() } -// + void SAL_CALL CFileOpenDialog::onInitDone() @@ -449,7 +449,7 @@ void SAL_CALL CFileOpenDialog::onInitDone() } -// + void SAL_CALL CFileOpenDialog::onFolderChanged() @@ -457,7 +457,7 @@ void SAL_CALL CFileOpenDialog::onFolderChanged() } -// + void SAL_CALL CFileOpenDialog::onTypeChanged(sal_uInt32) @@ -465,7 +465,7 @@ void SAL_CALL CFileOpenDialog::onTypeChanged(sal_uInt32) } -// + sal_uInt32 SAL_CALL CFileOpenDialog::onCtrlCommand(HWND, sal_uInt16, sal_uInt16) @@ -474,7 +474,7 @@ sal_uInt32 SAL_CALL CFileOpenDialog::onCtrlCommand(HWND, sal_uInt16, sal_uInt16) } -// + sal_uInt32 SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify ) @@ -513,7 +513,7 @@ sal_uInt32 SAL_CALL CFileOpenDialog::onWMNotify( HWND, LPOFNOTIFY lpOfNotify ) } -// + void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild) @@ -529,7 +529,7 @@ void SAL_CALL CFileOpenDialog::handleInitDialog(HWND hwndDlg, HWND hwndChild) } -// + UINT_PTR CALLBACK CFileOpenDialog::ofnHookProc( @@ -580,7 +580,7 @@ UINT_PTR CALLBACK CFileOpenDialog::ofnHookProc( } -// + LRESULT CALLBACK CFileOpenDialog::BaseDlgProc( @@ -609,7 +609,7 @@ LRESULT CALLBACK CFileOpenDialog::BaseDlgProc( } -// + CFileOpenDialog* SAL_CALL CFileOpenDialog::getCurrentInstance(HWND hwnd) @@ -620,7 +620,7 @@ CFileOpenDialog* SAL_CALL CFileOpenDialog::getCurrentInstance(HWND hwnd) } -// + void SAL_CALL CFileOpenDialog::centerPositionToParent() const diff --git a/fpicker/source/win32/filepicker/FileOpenDlg.hxx b/fpicker/source/win32/filepicker/FileOpenDlg.hxx index ca405760d002..de3f79e1b0c0 100644 --- a/fpicker/source/win32/filepicker/FileOpenDlg.hxx +++ b/fpicker/source/win32/filepicker/FileOpenDlg.hxx @@ -117,11 +117,11 @@ typedef _LPOPENFILENAMEA _LPOPENFILENAME; #endif // (_WIN32_WINNT >= 0x0500) -//------------------------------------------------------------- + // A simple wrapper class around the Win32 GetOpenFileName API. // This class is not thread-safe and only one instance at a // time is allowed -//------------------------------------------------------------- + class CFileOpenDialog { diff --git a/fpicker/source/win32/filepicker/FilePicker.cxx b/fpicker/source/win32/filepicker/FilePicker.cxx index 105bb81d73e1..2d91c3396c11 100644 --- a/fpicker/source/win32/filepicker/FilePicker.cxx +++ b/fpicker/source/win32/filepicker/FilePicker.cxx @@ -64,7 +64,7 @@ namespace } -// + CFilePicker::CFilePicker( const uno::Reference<lang::XMultiServiceFactory>& xServiceMgr) : @@ -102,7 +102,7 @@ void SAL_CALL CFilePicker::addFilePickerListener(const uno::Reference<XFilePicke } -// + void SAL_CALL CFilePicker::removeFilePickerListener(const uno::Reference<XFilePickerListener>& xListener ) @@ -129,7 +129,7 @@ void SAL_CALL CFilePicker::disposing(const lang::EventObject& aEvent) throw(uno: } -// + void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent) @@ -140,7 +140,7 @@ void SAL_CALL CFilePicker::fileSelectionChanged(FilePickerEvent aEvent) } -// + void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent) @@ -151,7 +151,7 @@ void SAL_CALL CFilePicker::directoryChanged(FilePickerEvent aEvent) } -// + void SAL_CALL CFilePicker::controlStateChanged(FilePickerEvent aEvent) @@ -162,7 +162,7 @@ void SAL_CALL CFilePicker::controlStateChanged(FilePickerEvent aEvent) } -// + void SAL_CALL CFilePicker::dialogSizeChanged() @@ -218,7 +218,7 @@ OUString SAL_CALL CFilePicker::helpRequested(FilePickerEvent aEvent) const } -// + bool CFilePicker::startupEventNotification(bool bStartupSuspended) @@ -227,7 +227,7 @@ bool CFilePicker::startupEventNotification(bool bStartupSuspended) } -// + void CFilePicker::shutdownEventNotification() @@ -236,7 +236,7 @@ void CFilePicker::shutdownEventNotification() } -// + void CFilePicker::suspendEventNotification() @@ -245,7 +245,7 @@ void CFilePicker::suspendEventNotification() } -// + void CFilePicker::resumeEventNotification() @@ -265,7 +265,7 @@ void SAL_CALL CFilePicker::setMultiSelectionMode(sal_Bool bMode) throw(uno::Runt } -// + void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeException) @@ -276,7 +276,7 @@ void SAL_CALL CFilePicker::setTitle(const OUString& aTitle) throw(uno::RuntimeEx } -// + void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& aFilter) @@ -288,7 +288,7 @@ void SAL_CALL CFilePicker::appendFilter(const OUString& aTitle, const OUString& } -// + void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle) @@ -300,7 +300,7 @@ void SAL_CALL CFilePicker::setCurrentFilter(const OUString& aTitle) } -// + OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException) @@ -311,7 +311,7 @@ OUString SAL_CALL CFilePicker::getCurrentFilter() throw(uno::RuntimeException) } -// + void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters) @@ -323,7 +323,7 @@ void SAL_CALL CFilePicker::appendFilterGroup(const OUString& sGroupTitle, const } -// + void SAL_CALL CFilePicker::setDefaultName(const OUString& aName) @@ -335,7 +335,7 @@ void SAL_CALL CFilePicker::setDefaultName(const OUString& aName) } -// + void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory) @@ -347,7 +347,7 @@ void SAL_CALL CFilePicker::setDisplayDirectory(const OUString& aDirectory) } -// + OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException) @@ -358,7 +358,7 @@ OUString SAL_CALL CFilePicker::getDisplayDirectory() throw(uno::RuntimeException } -// + uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeException) @@ -369,7 +369,7 @@ uno::Sequence<OUString> SAL_CALL CFilePicker::getFiles() throw(uno::RuntimeExcep } -// + uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::RuntimeException) { @@ -409,7 +409,7 @@ uno::Sequence< OUString > SAL_CALL CFilePicker::getSelectedFiles() throw (uno::R } -// + sal_Int16 SAL_CALL CFilePicker::execute() throw(uno::RuntimeException) @@ -454,7 +454,7 @@ void SAL_CALL CFilePicker::setValue(sal_Int16 aControlId, sal_Int16 aControlActi } -// + uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControlAction) @@ -467,7 +467,7 @@ uno::Any SAL_CALL CFilePicker::getValue(sal_Int16 aControlId, sal_Int16 aControl } -// + void SAL_CALL CFilePicker::enableControl(sal_Int16 aControlId, sal_Bool bEnable) @@ -480,7 +480,7 @@ throw(uno::RuntimeException) } -// + void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel) @@ -493,7 +493,7 @@ void SAL_CALL CFilePicker::setLabel(sal_Int16 aControlId, const OUString& aLabel } -// + OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId) @@ -506,7 +506,7 @@ OUString SAL_CALL CFilePicker::getLabel(sal_Int16 aControlId) } -// + uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw (uno::RuntimeException) @@ -518,7 +518,7 @@ uno::Sequence<sal_Int16> SAL_CALL CFilePicker::getSupportedImageFormats() throw } -// + sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeException) @@ -530,7 +530,7 @@ sal_Int32 SAL_CALL CFilePicker::getTargetColorDepth() throw (uno::RuntimeExcepti } -// + sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException) @@ -542,7 +542,7 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableWidth() throw (uno::RuntimeException } -// + sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeException) @@ -554,7 +554,7 @@ sal_Int32 SAL_CALL CFilePicker::getAvailableHeight() throw (uno::RuntimeExceptio } -// + void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aImage) @@ -567,7 +567,7 @@ void SAL_CALL CFilePicker::setImage(sal_Int16 aImageFormat, const uno::Any& aIma } -// + sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::RuntimeException) @@ -579,7 +579,7 @@ sal_Bool SAL_CALL CFilePicker::setShowState(sal_Bool bShowState) throw (uno::Run } -// + sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException) @@ -591,7 +591,7 @@ sal_Bool SAL_CALL CFilePicker::getShowState() throw (uno::RuntimeException) } -// + void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) @@ -692,7 +692,7 @@ void SAL_CALL CFilePicker::initialize(const uno::Sequence<uno::Any>& aArguments) } -// + void SAL_CALL CFilePicker::cancel() diff --git a/fpicker/source/win32/filepicker/FilePicker.hxx b/fpicker/source/win32/filepicker/FilePicker.hxx index 7675d014f033..92240cf7715e 100644 --- a/fpicker/source/win32/filepicker/FilePicker.hxx +++ b/fpicker/source/win32/filepicker/FilePicker.hxx @@ -33,19 +33,19 @@ #include <memory> -//---------------------------------------------------------- + // Implementation class for the XFilePicker Interface -//---------------------------------------------------------- -//---------------------------------------------------------- + + // forward declarations -//---------------------------------------------------------- + class CWinFileOpenImpl; -//---------------------------------------------------------- + // class declaration -//---------------------------------------------------------- + class CFilePickerDummy { @@ -71,18 +71,18 @@ public: // ctor CFilePicker( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceMgr ); - //------------------------------------------------------------------------------------ + // XFilePickerNotifier - //------------------------------------------------------------------------------------ + virtual void SAL_CALL addFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeFilePickerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >& xListener ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( ::com::sun::star::uno::RuntimeException ); @@ -90,9 +90,9 @@ public: virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePicker functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ); @@ -109,15 +109,15 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePicker2 functions - //------------------------------------------------------------------------------------ + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles( ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XFilterManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -128,16 +128,16 @@ public: virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilterGroupManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // XFilePickerControlAccess functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::uno::RuntimeException); @@ -154,9 +154,9 @@ public: virtual OUString SAL_CALL getLabel( sal_Int16 aControlId ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XFilePreview - //------------------------------------------------ + virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException); @@ -172,30 +172,30 @@ public: virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XInitialization - //------------------------------------------------ + virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XCancellable - //------------------------------------------------ + virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XEventListener - //------------------------------------------------ + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XServiceInfo - //------------------------------------------------ + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); @@ -206,9 +206,9 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - //------------------------------------------------------------------------------------ + // FilePicker Event functions - //------------------------------------------------------------------------------------ + void SAL_CALL fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ); diff --git a/fpicker/source/win32/filepicker/FilterContainer.cxx b/fpicker/source/win32/filepicker/FilterContainer.cxx index 1ca694643b1e..21a6e0e181a8 100644 --- a/fpicker/source/win32/filepicker/FilterContainer.cxx +++ b/fpicker/source/win32/filepicker/FilterContainer.cxx @@ -139,7 +139,7 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( const OUString& aName, OUString& } -// + sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFilter ) const @@ -160,7 +160,7 @@ sal_Bool SAL_CALL CFilterContainer::getFilter( sal_Int32 aIndex, OUString& theFi } -// + sal_Int32 SAL_CALL CFilterContainer::getFilterPos( const OUString& aName ) const @@ -228,7 +228,7 @@ OUString SAL_CALL CFilterContainer::getCurrentFilter() const return m_sCurrentFilter; } -//################################################################### + @@ -262,7 +262,7 @@ static sal_uInt32 _getTotalFilterLength( CFilterContainer& aFilterContainer ) } -// + inline diff --git a/fpicker/source/win32/filepicker/FilterContainer.hxx b/fpicker/source/win32/filepicker/FilterContainer.hxx index 2ef15ac0b1ca..1aeddff1abe0 100644 --- a/fpicker/source/win32/filepicker/FilterContainer.hxx +++ b/fpicker/source/win32/filepicker/FilterContainer.hxx @@ -25,9 +25,9 @@ #include <vector> -//------------------------------------------------------ + // helper class, only useable by OFilterContainer -//------------------------------------------------------ + class CFilterContainer { @@ -97,10 +97,10 @@ private: OUString m_sCurrentFilter; }; -//---------------------------------------------------------------- + // a helper function to create a filter buffer in the format // the Win32 API requires, e.g. "Text\0*.txt\0Doc\0*.doc;*xls\0\0" -//---------------------------------------------------------------- + OUString SAL_CALL makeWinFilterBuffer( CFilterContainer& aFilterContainer ); diff --git a/fpicker/source/win32/filepicker/Fps.rc b/fpicker/source/win32/filepicker/Fps.rc index 617f761db9e8..6cab1a5f426c 100644 --- a/fpicker/source/win32/filepicker/Fps.rc +++ b/fpicker/source/win32/filepicker/Fps.rc @@ -17,20 +17,20 @@ */ //Microsoft Developer Studio generated resource script. -// + #include "resource.h" #define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 2 resource. -// + #include "afxres.h" -///////////////////////////////////////////////////////////////////////////// + #undef APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// + // German (Germany) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU) @@ -40,10 +40,10 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN #endif //_WIN32 #ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // TEXTINCLUDE -// + 1 TEXTINCLUDE DISCARDABLE BEGIN @@ -65,10 +65,10 @@ END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Dialog -// + 1001 DIALOG DISCARDABLE 0, 0, 338, 67 STYLE DS_3DLOOK | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS @@ -170,10 +170,10 @@ BEGIN END -///////////////////////////////////////////////////////////////////////////// -// + + // DESIGNINFO -// + #ifdef APSTUDIO_INVOKED GUIDELINES DESIGNINFO DISCARDABLE @@ -231,10 +231,10 @@ END #endif // APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Dialog Info -// + 1001 DLGINIT BEGIN @@ -259,17 +259,17 @@ BEGIN END #endif // German (Germany) resources -///////////////////////////////////////////////////////////////////////////// + #ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// + + // Generated from the TEXTINCLUDE 3 resource. -// -///////////////////////////////////////////////////////////////////////////// + + #endif // not APSTUDIO_INVOKED diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx index 466061ea60c2..19c74370e4e3 100644 --- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx +++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx @@ -32,11 +32,11 @@ namespace fpicker{ namespace win32{ namespace vista{ -//----------------------------------------------------------------------------- + // types, const etcpp. -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- + + /** todo document me */ class IVistaFilePickerInternalNotify diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.cxx b/fpicker/source/win32/filepicker/PreviewCtrl.cxx index 55d58e689c08..9e8ee049bd1f 100644 --- a/fpicker/source/win32/filepicker/PreviewCtrl.cxx +++ b/fpicker/source/win32/filepicker/PreviewCtrl.cxx @@ -61,7 +61,7 @@ namespace // private }; - // + inline @@ -81,7 +81,7 @@ namespace // private } - // + inline @@ -91,7 +91,7 @@ namespace // private } - // + inline @@ -219,7 +219,7 @@ CFilePreview* CFilePreview::createInstance( } -// + CFilePreview::CFilePreview( @@ -273,7 +273,7 @@ CFilePreview::CFilePreview( } -// + CFilePreview::~CFilePreview( ) @@ -366,7 +366,7 @@ sal_Bool SAL_CALL CFilePreview::getPos( POINT& ulCorner ) const } -// + void SAL_CALL CFilePreview::enable( sal_Bool bEnable ) @@ -428,7 +428,7 @@ sal_Bool SAL_CALL CFilePreview::update( const OUString& aFileName ) } -// + void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC ) @@ -481,7 +481,7 @@ void SAL_CALL CFilePreview::onPaint( HWND hWnd, HDC hDC ) } -// + sal_Bool CFilePreview::loadFile( const OUString& aFileName ) @@ -552,7 +552,7 @@ CLEANUP_AND_EXIT: } -// + LRESULT CALLBACK CFilePreview::WndProc( diff --git a/fpicker/source/win32/filepicker/PreviewCtrl.hxx b/fpicker/source/win32/filepicker/PreviewCtrl.hxx index f7d7177464da..60117965765f 100644 --- a/fpicker/source/win32/filepicker/PreviewCtrl.hxx +++ b/fpicker/source/win32/filepicker/PreviewCtrl.hxx @@ -27,9 +27,9 @@ #include <memory> -//--------------------------------------------- + // declaration -//--------------------------------------------- + class CDimension { @@ -50,7 +50,7 @@ public: sal_Int32 m_cy; }; -//-------------------------------------------------- + // we use OleInitialize here because we are calling // some Ole functions to realize the picture preview // and we expect to be called from the main thread @@ -58,7 +58,7 @@ public: // OleInitialize (the main thread should be an STA) // When OleInitialize should fail at worst the // preview doesn't work -//-------------------------------------------------- + class CAutoOleInit { @@ -81,7 +81,7 @@ public: } }; -//--------------------------------------------- + // A simple file preview class to preview some // common picture formats like *.gif, *jpg, etc. // This class is not thread-safe and is @@ -93,7 +93,7 @@ public: // only on shutdown (unloading of the dll) - // it's a question of taste (other solutions // are possible) -//--------------------------------------------- + class CFilePreview { diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.cxx b/fpicker/source/win32/filepicker/VistaFilePicker.cxx index d0d22a5319a2..9cbec92c750a 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.cxx @@ -332,7 +332,7 @@ void SAL_CALL VistaFilePicker::setValue( ::sal_Int16 nControlId , } -// + css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId , @@ -350,7 +350,7 @@ css::uno::Any SAL_CALL VistaFilePicker::getValue(::sal_Int16 nControlId , } -// + void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId, @@ -366,7 +366,7 @@ void SAL_CALL VistaFilePicker::enableControl(::sal_Int16 nControlId, } -// + void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId, @@ -382,7 +382,7 @@ void SAL_CALL VistaFilePicker::setLabel( ::sal_Int16 nControlId, } -// + OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId) @@ -398,7 +398,7 @@ OUString SAL_CALL VistaFilePicker::getLabel(::sal_Int16 nControlId) } -// + css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFormats() @@ -408,7 +408,7 @@ css::uno::Sequence< ::sal_Int16 > SAL_CALL VistaFilePicker::getSupportedImageFor } -// + sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth() @@ -418,7 +418,7 @@ sal_Int32 SAL_CALL VistaFilePicker::getTargetColorDepth() } -// + sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth() @@ -428,7 +428,7 @@ sal_Int32 SAL_CALL VistaFilePicker::getAvailableWidth() } -// + sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight() @@ -438,7 +438,7 @@ sal_Int32 SAL_CALL VistaFilePicker::getAvailableHeight() } -// + void SAL_CALL VistaFilePicker::setImage( sal_Int16 /*nImageFormat*/, @@ -449,7 +449,7 @@ void SAL_CALL VistaFilePicker::setImage( sal_Int16 /*nImageFormat*/, } -// + sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/) @@ -459,7 +459,7 @@ sal_Bool SAL_CALL VistaFilePicker::setShowState(sal_Bool /*bShowState*/) } -// + sal_Bool SAL_CALL VistaFilePicker::getShowState() @@ -469,7 +469,7 @@ sal_Bool SAL_CALL VistaFilePicker::getShowState() } -// + void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::Any >& lArguments) @@ -593,7 +593,7 @@ void SAL_CALL VistaFilePicker::initialize(const css::uno::Sequence< css::uno::An } -// + void SAL_CALL VistaFilePicker::cancel() diff --git a/fpicker/source/win32/filepicker/VistaFilePicker.hxx b/fpicker/source/win32/filepicker/VistaFilePicker.hxx index b128fc52760d..2ce0b1f4c407 100644 --- a/fpicker/source/win32/filepicker/VistaFilePicker.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePicker.hxx @@ -40,9 +40,9 @@ namespace fpicker{ namespace win32{ namespace vista{ -//----------------------------------------------------------------------------- + // types -//----------------------------------------------------------------------------- + typedef ::cppu::WeakComponentImplHelper6< css::ui::dialogs::XFilePicker2, @@ -52,7 +52,7 @@ typedef ::cppu::WeakComponentImplHelper6< css::lang::XInitialization, css::lang::XServiceInfo > TVistaFilePickerBase; -//----------------------------------------------------------------------------- + /** Implements the XFilePicker & friends interface(s) for Windos Vista and upcoming versions. @@ -65,16 +65,16 @@ class VistaFilePicker : public ::cppu::BaseMutex { public: - //------------------------------------------------------------------------------------ + // ctor/dtor - //------------------------------------------------------------------------------------ + VistaFilePicker( const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR ); virtual ~VistaFilePicker(); - //------------------------------------------------------------------------------------ + // XFilePickerNotifier - //------------------------------------------------------------------------------------ + virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException ); @@ -82,9 +82,9 @@ public: virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XExecutableDialog functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw( css::uno::RuntimeException ); @@ -92,9 +92,9 @@ public: virtual sal_Int16 SAL_CALL execute( ) throw( css::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePicker functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( css::uno::RuntimeException ); @@ -112,16 +112,16 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getFiles( ) throw( css::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePicker2 functions - //------------------------------------------------------------------------------------ + virtual css::uno::Sequence< OUString > SAL_CALL getSelectedFiles( ) throw( css::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilterManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilter( const OUString& sTitle , const OUString& sFilter ) @@ -135,18 +135,18 @@ public: virtual OUString SAL_CALL getCurrentFilter( ) throw( css::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilterGroupManager functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const css::uno::Sequence< css::beans::StringPair >& lFilters ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFilePickerControlAccess functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setValue( sal_Int16 nControlId , sal_Int16 nControlAction, @@ -168,9 +168,9 @@ public: virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (css::uno::RuntimeException); - //------------------------------------------------ + // XFilePreview - //------------------------------------------------ + virtual css::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (css::uno::RuntimeException); @@ -194,31 +194,31 @@ public: virtual sal_Bool SAL_CALL getShowState( ) throw (css::uno::RuntimeException); - //------------------------------------------------ + // XInitialization - //------------------------------------------------ + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& lArguments ) throw(css::uno::Exception , css::uno::RuntimeException); - //------------------------------------------------ + // XCancellable - //------------------------------------------------ + virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException); - //------------------------------------------------ + // XEventListener - //------------------------------------------------ + virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw(css::uno::RuntimeException); - //------------------------------------------------ + // XServiceInfo - //------------------------------------------------ + virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException); @@ -230,9 +230,9 @@ public: throw(css::uno::RuntimeException); /* - //------------------------------------------------------------------------------------ + // FilePicker Event functions - //------------------------------------------------------------------------------------ + void SAL_CALL fileSelectionChanged(const css::ui::dialogs::FilePickerEvent& aEvent ); void SAL_CALL directoryChanged(const css::ui::dialogs::FilePickerEvent& aEvent ); @@ -256,21 +256,21 @@ public: private: - //--------------------------------------------------------------------- + /// service manager to create own used uno services css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - //--------------------------------------------------------------------- + css::uno::Sequence< OUString > m_lLastFiles; - //--------------------------------------------------------------------- + /** execute the COM dialog within a STA thread * Must be used on the heap ... because it's implemented as OSL thread .-) */ RequestHandlerRef m_rDialog; AsyncRequests m_aAsyncExecute; - //--------------------------------------------------------------------- + oslThreadIdentifier m_nFilePickerThreadId; bool m_bInitialized; diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx index 883ff348069f..2d8901d17704 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx @@ -44,11 +44,11 @@ namespace fpicker{ namespace win32{ namespace vista{ -//----------------------------------------------------------------------------- + // types, const etcpp. -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- + + /** todo document me */ class VistaFilePickerEventHandler : public ::cppu::BaseMutex @@ -57,24 +57,24 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex { public: - //------------------------------------------------------------------------------------ + // ctor/dtor - //------------------------------------------------------------------------------------ + VistaFilePickerEventHandler(IVistaFilePickerInternalNotify* pInternalNotify); virtual ~VistaFilePickerEventHandler(); - //------------------------------------------------------------------------------------ + // IUnknown - //------------------------------------------------------------------------------------ + virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID rIID , void** ppObject); virtual ULONG STDMETHODCALLTYPE AddRef(); virtual ULONG STDMETHODCALLTYPE Release(); - //------------------------------------------------------------------------------------ + // IFileDialogEvents - //------------------------------------------------------------------------------------ + STDMETHODIMP OnFileOk(IFileDialog* pDialog); @@ -95,9 +95,9 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex IShellItem* pItem , FDE_OVERWRITE_RESPONSE* pResponse); - //------------------------------------------------------------------------------------ + // IFileDialogControlEvents - //------------------------------------------------------------------------------------ + STDMETHODIMP OnItemSelected(IFileDialogCustomize* pCustomize, DWORD nIDCtl , @@ -113,9 +113,9 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex STDMETHODIMP OnControlActivating(IFileDialogCustomize* pCustomize, DWORD nIDCtl ); - //------------------------------------------------------------------------------------ + // XFilePickerNotifier - //------------------------------------------------------------------------------------ + virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException ); @@ -123,11 +123,11 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< css::ui::dialogs::XFilePickerListener >& xListener ) throw( css::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // native interface - //------------------------------------------------------------------------------------ - //------------------------------------------------------------------------------------ + + /** start listening for file picker events on the given file open dialog COM object. * * The broadcaster will be cached internally so deregistration will be easy. @@ -142,7 +142,7 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex */ void startListening( const TFileDialog& pBroadcaster ); - //------------------------------------------------------------------------------------ + /** stop listening for file picker events on the internally cached dialog COM object. * * The COM dialog provided on the startListeneing() call was cached internally. @@ -164,29 +164,29 @@ class VistaFilePickerEventHandler : public ::cppu::BaseMutex private: - //------------------------------------------------------------------------------------ + /// @todo document me void impl_sendEvent( EEventType eEventType, ::sal_Int16 nControlID); private: - //------------------------------------------------------------------------------------ + /// ref count for AddRef/Release() oslInterlockedCount m_nRefCount; - //------------------------------------------------------------------------------------ + /// unique handle for this listener provided by the broadcaster on registration time DWORD m_nListenerHandle; - //------------------------------------------------------------------------------------ + /// cached file dialog instance (there we listen for events) TFileDialog m_pDialog; - //--------------------------------------------------------------------- + IVistaFilePickerInternalNotify* m_pInternalNotify; - //--------------------------------------------------------------------- + /** used to inform file picker listener asynchronously. * Those listener must be called asynchronously .. because * every request will block the caller thread. Mostly that will be diff --git a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx index 0bf0d8894cb6..875e074c62bd 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx @@ -58,9 +58,9 @@ namespace fpicker{ namespace win32{ namespace vista{ -//----------------------------------------------------------------------------- + // types, const etcpp -//----------------------------------------------------------------------------- + static const ::sal_Int32 FEATURE_AUTOEXTENSION = 1; static const ::sal_Int32 FEATURE_PASSWORD = 2; @@ -95,19 +95,19 @@ static const OUString PROP_CONTROL_LABEL("control_label" ); // [OUString] static const OUString PROP_CONTROL_ENABLE("control_enable" ); // [sal_Bool] true=ON, false=OFF static const OUString STRING_SEPARATOR("------------------------------------------" ); -//----------------------------------------------------------------------------- + /** native implementation of the file picker on Vista and upcoming windows versions. * This dialog uses COM internally. Further it marshall every request so it will * be executed within it's own STA thread ! */ -//----------------------------------------------------------------------------- + class VistaFilePickerImpl : private ::cppu::BaseMutex , public RequestHandler , public IVistaFilePickerInternalNotify { public: - //--------------------------------------------------------------------- + /** used for marshalling requests. * Will be used to map requests to the right implementations. */ @@ -139,113 +139,113 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex public: - //--------------------------------------------------------------------- + // ctor/dtor - nothing special - //--------------------------------------------------------------------- + VistaFilePickerImpl(); virtual ~VistaFilePickerImpl(); - //--------------------------------------------------------------------- + // RequestHandler - //--------------------------------------------------------------------- + virtual void before(); virtual void doRequest(const RequestRef& rRequest); virtual void after(); - //--------------------------------------------------------------------- + // IVistaFilePickerInternalNotify - //--------------------------------------------------------------------- + virtual void onAutoExtensionChanged (bool bChecked); virtual bool onFileTypeChanged( UINT nTypeIndex ); private: - //--------------------------------------------------------------------- + /// implementation of request E_ADD_FILEPICKER_LISTENER void impl_sta_addFilePickerListener(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_REMOVE_FILEPICKER_LISTENER void impl_sta_removeFilePickerListener(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_APPEND_FILTER void impl_sta_appendFilter(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_APPEND_FILTERGROUP void impl_sta_appendFilterGroup(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_SET_CURRENT_FILTER void impl_sta_setCurrentFilter(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_GET_CURRENT_FILTER void impl_sta_getCurrentFilter(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_CREATE_OPEN_DIALOG void impl_sta_CreateOpenDialog(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_CREATE_SAVE_DIALOG void impl_sta_CreateSaveDialog(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_SET_MULTISELECTION_MODE void impl_sta_SetMultiSelectionMode(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_SET_TITLE void impl_sta_SetTitle(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_SET_FILENAME void impl_sta_SetFileName(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_SET_DIRECTORY void impl_sta_SetDirectory(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_GET_DIRECTORY void impl_sta_GetDirectory(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_SET_DEFAULT_NAME void impl_sta_SetDefaultName(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_GET_SELECTED_FILES void impl_sta_getSelectedFiles(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_SHOW_DIALOG_MODAL void impl_sta_ShowDialogModal(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_SET_CONTROL_VALUE void impl_sta_SetControlValue(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_GET_CONTROL_VALUE void impl_sta_GetControlValue(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_SET_CONTROL_LABEL void impl_sta_SetControlLabel(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_GET_CONTROL_LABEL void impl_sta_GetControlLabel(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /// implementation of request E_ENABLE_CONTROL void impl_sta_EnableControl(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /** create all needed (optional!) UI controls addressed by the field nFeatures. * The given number nFeatures is used as a flag field. Use const values FEATURE_XXX * to address it. @@ -265,7 +265,7 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex */ void impl_sta_enableFeatures(::sal_Int32 nFeatures, ::sal_Int32 nTemplate); - //--------------------------------------------------------------------- + /** returns an interface, which can be used to customize the internally used * COM dialog. * @@ -278,7 +278,7 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex TFileDialogCustomize impl_getCustomizeInterface(); TFileDialog impl_getBaseDialogInterface(); - //--------------------------------------------------------------------- + /// fill filter list of internal used dialog. void impl_sta_setFiltersOnDialog(); @@ -286,23 +286,23 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex private: - //--------------------------------------------------------------------- + /// COM object representing a file open dialog TFileOpenDialog m_iDialogOpen; - //--------------------------------------------------------------------- + /// COM object representing a file save dialog TFileSaveDialog m_iDialogSave; - //--------------------------------------------------------------------- + /// knows the return state of the last COM call HRESULT m_hLastResult; - //--------------------------------------------------------------------- + /// @todo document me CFilterContainer m_lFilters; - //--------------------------------------------------------------------- + /** cache last selected list of files * Because those list must be retrieved directly after closing the dialog * (and only in case it was finished successfully) we cache it internally. @@ -311,13 +311,13 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex */ css::uno::Sequence< OUString > m_lLastFiles; - //--------------------------------------------------------------------- + /** help us to handle dialog events and provide them to interested office * listener. */ TFileDialogEvents m_iEventHandler; - //--------------------------------------------------------------------- + /// @todo document me ::sal_Bool m_bInExecute; @@ -326,10 +326,10 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex // handle to parent window HWND m_hParentWindow; - // + OUString m_sDirectory; - // + OUString m_sFilename; // Resource provider diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx index a493af6cc4e0..261ce0de7bc5 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.cxx @@ -145,7 +145,7 @@ OUString CWinFileOpenImpl::getDisplayDirectory() throw(uno::RuntimeException) } -// + void SAL_CALL CWinFileOpenImpl::setDefaultName(const OUString& aName) @@ -261,7 +261,7 @@ OUString SAL_CALL CWinFileOpenImpl::getCurrentFilter() throw(uno::RuntimeExcepti } -// + inline void SAL_CALL CWinFileOpenImpl::appendFilterGroupSeparator() @@ -295,9 +295,9 @@ void SAL_CALL CWinFileOpenImpl::appendFilterGroup(const OUString& sGroupTitle, c } } -//================================================================================================================= + // XExtendedFilePicker -//================================================================================================================= + // #i90917: Due to a different feature set for the system-dependent file pickers // it's possible that generic code (e.g. sfx2) provides control ids @@ -347,7 +347,7 @@ void SAL_CALL CWinFileOpenImpl::enableControl(sal_Int16 ControlID, sal_Bool bEna } -// + void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& aLabel ) @@ -359,7 +359,7 @@ void SAL_CALL CWinFileOpenImpl::setLabel( sal_Int16 aControlId, const OUString& } -// + OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId ) @@ -373,7 +373,7 @@ OUString SAL_CALL CWinFileOpenImpl::getLabel( sal_Int16 aControlId ) } -// + uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats() @@ -383,7 +383,7 @@ uno::Sequence<sal_Int16> SAL_CALL CWinFileOpenImpl::getSupportedImageFormats() } -// + sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth() @@ -393,7 +393,7 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getTargetColorDepth() } -// + sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth() @@ -403,7 +403,7 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableWidth() } -// + sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight() @@ -413,7 +413,7 @@ sal_Int32 SAL_CALL CWinFileOpenImpl::getAvailableHeight() } -// + void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any& aImage) @@ -423,7 +423,7 @@ void SAL_CALL CWinFileOpenImpl::setImage(sal_Int16 aImageFormat, const uno::Any& } -// + sal_Bool SAL_CALL CWinFileOpenImpl::setShowState(sal_Bool bShowState) @@ -433,7 +433,7 @@ sal_Bool SAL_CALL CWinFileOpenImpl::setShowState(sal_Bool bShowState) } -// + sal_Bool SAL_CALL CWinFileOpenImpl::getShowState() @@ -443,7 +443,7 @@ sal_Bool SAL_CALL CWinFileOpenImpl::getShowState() } -// + void SAL_CALL CWinFileOpenImpl::cancel() @@ -478,7 +478,7 @@ sal_Int16 SAL_CALL CWinFileOpenImpl::getFocused() } -// + inline sal_Bool SAL_CALL CWinFileOpenImpl::IsCustomControlHelpRequested(LPHELPINFO lphi) const @@ -560,7 +560,7 @@ LRESULT CALLBACK CWinFileOpenImpl::SubClassFunc( } -// + void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd) @@ -596,7 +596,7 @@ void SAL_CALL CWinFileOpenImpl::InitCustomControlContainer(HWND hCustomControl) } -// + void SAL_CALL CWinFileOpenImpl::CacheControlState(HWND hWnd) @@ -606,7 +606,7 @@ void SAL_CALL CWinFileOpenImpl::CacheControlState(HWND hWnd) } -// + BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam) @@ -638,7 +638,7 @@ BOOL CALLBACK CWinFileOpenImpl::EnumChildWndProc(HWND hWnd, LPARAM lParam) } -// + sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk() @@ -656,7 +656,7 @@ sal_uInt32 SAL_CALL CWinFileOpenImpl::onFileOk() } -// + void SAL_CALL CWinFileOpenImpl::onSelChanged(HWND) @@ -791,7 +791,7 @@ void SAL_CALL CWinFileOpenImpl::onInitDone() } -// + void SAL_CALL CWinFileOpenImpl::onFolderChanged() @@ -801,7 +801,7 @@ void SAL_CALL CWinFileOpenImpl::onFolderChanged() } -// + void SAL_CALL CWinFileOpenImpl::onTypeChanged(sal_uInt32) @@ -833,7 +833,7 @@ sal_uInt32 SAL_CALL CWinFileOpenImpl::onCtrlCommand( } -// + void CWinFileOpenImpl::onWMSize() @@ -844,7 +844,7 @@ void CWinFileOpenImpl::onWMSize() } -// + void CWinFileOpenImpl::onWMShow(sal_Bool bShow) @@ -853,7 +853,7 @@ void CWinFileOpenImpl::onWMShow(sal_Bool bShow) } -// + void CWinFileOpenImpl::onWMWindowPosChanged() @@ -862,7 +862,7 @@ void CWinFileOpenImpl::onWMWindowPosChanged() } -// + void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi) @@ -882,7 +882,7 @@ void CWinFileOpenImpl::onCustomControlHelpRequest(LPHELPINFO lphi) } -// + void SAL_CALL CWinFileOpenImpl::onInitDialog(HWND hwndDlg) @@ -923,7 +923,7 @@ void CWinFileOpenImpl::postModal(sal_Int16 nDialogResult) } -// + void SAL_CALL CWinFileOpenImpl::SetDefaultExtension() @@ -973,7 +973,7 @@ void SAL_CALL CWinFileOpenImpl::SetDefaultExtension() } -// + void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName() diff --git a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx index b1be8a1dfbfa..d4b2a3bfc07e 100644 --- a/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx +++ b/fpicker/source/win32/filepicker/WinFileOpenImpl.hxx @@ -55,15 +55,15 @@ public: virtual ~CWinFileOpenImpl( ); - //----------------------------------------------------------------------------------------- + // XExecutableDialog - //----------------------------------------------------------------------------------------- + virtual sal_Int16 SAL_CALL execute( ) throw( ::com::sun::star::uno::RuntimeException ); - //----------------------------------------------------------------------------------------- + // XFilePicker - //----------------------------------------------------------------------------------------- + virtual void SAL_CALL setDefaultName( const OUString& aName ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -76,9 +76,9 @@ public: virtual OUString SAL_CALL getDisplayDirectory( ) throw ( ::com::sun::star::uno::RuntimeException ); - //----------------------------------------------------------------------------------------- + // XFilterManager - //----------------------------------------------------------------------------------------- + virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); @@ -89,16 +89,16 @@ public: virtual OUString SAL_CALL getCurrentFilter( ) throw( ::com::sun::star::uno::RuntimeException ); - //----------------------------------------------------------------------------------------- + // XFilterGroupManager - //----------------------------------------------------------------------------------------- + virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - //----------------------------------------------------------------------------------------- + // XFilePickerControlAccess - //----------------------------------------------------------------------------------------- + virtual void SAL_CALL setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const ::com::sun::star::uno::Any& aValue ) throw( ::com::sun::star::uno::RuntimeException ); @@ -115,9 +115,9 @@ public: virtual OUString SAL_CALL getLabel( sal_Int16 aControlId ) throw ( ::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XFilePreview - //------------------------------------------------ + virtual ::com::sun::star::uno::Sequence< sal_Int16 > SAL_CALL getSupportedImageFormats( ) throw (::com::sun::star::uno::RuntimeException); @@ -140,15 +140,15 @@ public: virtual sal_Bool SAL_CALL getShowState( ) throw (::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XCancelable - //------------------------------------------------ + virtual void SAL_CALL cancel( ); - //------------------------------------------------ + // Implementation details - //------------------------------------------------ + protected: sal_Int16 SAL_CALL getFocused( ); diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.cxx b/fpicker/source/win32/filepicker/asynceventnotifier.cxx index 35599c87e0d1..b6a61b4da77f 100644 --- a/fpicker/source/win32/filepicker/asynceventnotifier.cxx +++ b/fpicker/source/win32/filepicker/asynceventnotifier.cxx @@ -27,14 +27,14 @@ #include "SolarMutex.hxx" -// + using namespace com::sun::star; using ::com::sun::star::ui::dialogs::XFilePickerListener; -// + CAsyncEventNotifier::CAsyncEventNotifier(cppu::OBroadcastHelper& rBroadcastHelper) : @@ -59,7 +59,7 @@ CAsyncEventNotifier::CAsyncEventNotifier(cppu::OBroadcastHelper& rBroadcastHelpe } -// + CAsyncEventNotifier::~CAsyncEventNotifier() @@ -71,7 +71,7 @@ CAsyncEventNotifier::~CAsyncEventNotifier() } -// + void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type& aType , @@ -91,7 +91,7 @@ void SAL_CALL CAsyncEventNotifier::addListener(const uno::Type& } -// + void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type& aType , @@ -106,7 +106,7 @@ void SAL_CALL CAsyncEventNotifier::removeListener(const uno::Type& } -// + bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended) @@ -138,7 +138,7 @@ bool SAL_CALL CAsyncEventNotifier::startup(bool bCreateSuspended) } -// + void SAL_CALL CAsyncEventNotifier::shutdown() @@ -176,7 +176,7 @@ void SAL_CALL CAsyncEventNotifier::shutdown() } -// + void CAsyncEventNotifier::suspend() @@ -185,7 +185,7 @@ void CAsyncEventNotifier::suspend() } -// + void CAsyncEventNotifier::resume() @@ -194,7 +194,7 @@ void CAsyncEventNotifier::resume() } -// + void SAL_CALL CAsyncEventNotifier::notifyEvent(CEventNotification* EventNotification) @@ -211,7 +211,7 @@ void SAL_CALL CAsyncEventNotifier::notifyEvent(CEventNotification* EventNotifica } -// + size_t SAL_CALL CAsyncEventNotifier::getEventListSize() @@ -221,7 +221,7 @@ size_t SAL_CALL CAsyncEventNotifier::getEventListSize() } -// + void SAL_CALL CAsyncEventNotifier::resetNotifyEvent() @@ -232,7 +232,7 @@ void SAL_CALL CAsyncEventNotifier::resetNotifyEvent() } -// + CEventNotification* SAL_CALL CAsyncEventNotifier::getNextEventRecord() @@ -242,7 +242,7 @@ CEventNotification* SAL_CALL CAsyncEventNotifier::getNextEventRecord() } -// + void SAL_CALL CAsyncEventNotifier::removeNextEventRecord() @@ -252,7 +252,7 @@ void SAL_CALL CAsyncEventNotifier::removeNextEventRecord() } -// + void SAL_CALL CAsyncEventNotifier::run() @@ -298,7 +298,7 @@ void SAL_CALL CAsyncEventNotifier::run() } -// + unsigned int WINAPI CAsyncEventNotifier::ThreadProc(LPVOID pParam) diff --git a/fpicker/source/win32/filepicker/asynceventnotifier.hxx b/fpicker/source/win32/filepicker/asynceventnotifier.hxx index a15bcfdf0282..731eccf85fe6 100644 --- a/fpicker/source/win32/filepicker/asynceventnotifier.hxx +++ b/fpicker/source/win32/filepicker/asynceventnotifier.hxx @@ -36,9 +36,9 @@ #include <utility> #include "eventnotification.hxx" -//--------------------------------------------- -// -//--------------------------------------------- + + + class CAsyncEventNotifier { diff --git a/fpicker/source/win32/filepicker/asyncrequests.hxx b/fpicker/source/win32/filepicker/asyncrequests.hxx index ae9a5702d38f..e67dcfa4bdbe 100644 --- a/fpicker/source/win32/filepicker/asyncrequests.hxx +++ b/fpicker/source/win32/filepicker/asyncrequests.hxx @@ -32,23 +32,23 @@ namespace fpicker{ namespace win32{ namespace vista{ -//----------------------------------------------------------------------------- + /** @todo document me */ class Request { - //------------------------------------------------------------------------- + public: static const ::sal_Int32 WAIT_INFINITE = 0; - //------------------------------------------------------------------------- + // interface - //------------------------------------------------------------------------- + public: - //--------------------------------------------------------------------- + explicit Request() : m_aJoiner ( ) , m_nRequest (-1) @@ -57,28 +57,28 @@ class Request m_aJoiner.reset(); } - //--------------------------------------------------------------------- + virtual ~Request() {}; - //--------------------------------------------------------------------- + void setRequest(::sal_Int32 nRequest) { m_nRequest = nRequest; } - //--------------------------------------------------------------------- + ::sal_Int32 getRequest() { return m_nRequest; } - //--------------------------------------------------------------------- + void clearArguments() { m_lArguments.clear(); } - //--------------------------------------------------------------------- + template< class TArgumentType > void setArgument(const OUString& sName , const TArgumentType& aValue) @@ -86,7 +86,7 @@ class Request m_lArguments[sName] <<= aValue; } - //--------------------------------------------------------------------- + template< class TArgumentType > TArgumentType getArgumentOrDefault(const OUString& sName , const TArgumentType& aDefault) @@ -94,17 +94,17 @@ class Request return m_lArguments.getUnpackedValueOrDefault(sName, aDefault); } - //--------------------------------------------------------------------- + void wait(::sal_Int32 nMilliSeconds = WAIT_INFINITE); void waitProcessMessages(); - //--------------------------------------------------------------------- + void notify(); - //------------------------------------------------------------------------- + // member - //------------------------------------------------------------------------- + private: @@ -116,7 +116,7 @@ class Request typedef ::boost::shared_ptr< Request > RequestRef; typedef ::std::queue< RequestRef > RequestQueue; -//----------------------------------------------------------------------------- + class RequestHandler { public: @@ -127,7 +127,7 @@ class RequestHandler typedef ::boost::shared_ptr< RequestHandler > RequestHandlerRef; -//----------------------------------------------------------------------------- + /** @todo document me */ class AsyncRequests : private ::cppu::BaseMutex @@ -138,7 +138,7 @@ class AsyncRequests : private ::cppu::BaseMutex static const ::sal_Int16 BLOCKED = 1; static const ::sal_Int16 NON_BLOCKED = 0; - //--------------------------------------------------------------------- + /** creates the new asynchronous request executor. */ explicit AsyncRequests(const RequestHandlerRef& rHandler); @@ -151,32 +151,32 @@ class AsyncRequests : private ::cppu::BaseMutex /// ensure the execution thread gets going. void triggerJobExecution(); - //--------------------------------------------------------------------- + /** does nothing special / excepting to make sure our class wont be inline .-) */ virtual ~AsyncRequests(); - //--------------------------------------------------------------------- + /** @todo document me */ void triggerRequestProcessMessages (const RequestRef& rRequest); - //--------------------------------------------------------------------- + /** @todo document me */ void triggerRequestBlocked(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /** @todo document me */ void triggerRequestNonBlocked(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /** @todo document me */ void triggerRequestDirectly(const RequestRef& rRequest); - //--------------------------------------------------------------------- + /** @todo document me */ void triggerRequestThreadAware(const RequestRef& rRequest, @@ -184,7 +184,7 @@ class AsyncRequests : private ::cppu::BaseMutex private: - //--------------------------------------------------------------------- + /** our STA .-) * Will run between start() & finish(). Internally it runs a loop ... * waiting for requests. Every request will be executed synchronously diff --git a/fpicker/source/win32/filepicker/comptr.hxx b/fpicker/source/win32/filepicker/comptr.hxx index 8eac635d3131..38e9f12d5415 100644 --- a/fpicker/source/win32/filepicker/comptr.hxx +++ b/fpicker/source/win32/filepicker/comptr.hxx @@ -31,7 +31,7 @@ class ComPtr { public: - //--------------------------------------------------------------------- + /** initialize com ptr with null. */ ComPtr() @@ -39,7 +39,7 @@ class ComPtr m_pInterface = NULL; } - //--------------------------------------------------------------------- + /** initialize com ptr with given interface. */ ComPtr(T_INTERFACE* pInterface) @@ -49,7 +49,7 @@ class ComPtr m_pInterface->AddRef(); } - //--------------------------------------------------------------------- + /** copy ctor. */ ComPtr(const ComPtr< T_INTERFACE, P_IID, P_CLSID >& aCopy) @@ -59,7 +59,7 @@ class ComPtr m_pInterface->AddRef(); } - //--------------------------------------------------------------------- + /** initialize object by quering external object for the right interface. */ ComPtr(IUnknown* pIUnknown) @@ -68,7 +68,7 @@ class ComPtr pIUnknown->QueryInterface(P_IID, (void**)&m_pInterface); } - //--------------------------------------------------------------------- + /** deinitialize com object right. */ ~ComPtr() @@ -78,37 +78,37 @@ class ComPtr public: - //--------------------------------------------------------------------- + HRESULT create() { return CoCreateInstance(P_CLSID, NULL, CLSCTX_ALL, P_IID, (void**)&m_pInterface); } - //--------------------------------------------------------------------- + operator T_INTERFACE*() const { return m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE& operator*() const { return *m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE** operator&() { return &m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE* operator->() const { return m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE* operator=(T_INTERFACE* pInterface) { if ( equals(pInterface) ) @@ -122,7 +122,7 @@ class ComPtr return m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE* operator=(IUnknown* pIUnknown) { if (pIUnknown) @@ -130,7 +130,7 @@ class ComPtr return m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE* operator=(const ComPtr< T_INTERFACE, P_IID, P_CLSID >& aCopy) { m_pInterface = aCopy.m_pInterface; @@ -140,13 +140,13 @@ class ComPtr return m_pInterface; } - //--------------------------------------------------------------------- + T_INTERFACE* get() const { return m_pInterface; } - //--------------------------------------------------------------------- + void attach(T_INTERFACE* pInterface) { if (pInterface) @@ -156,7 +156,7 @@ class ComPtr } } - //--------------------------------------------------------------------- + T_INTERFACE* detach() { T_INTERFACE* pInterface = m_pInterface; @@ -164,7 +164,7 @@ class ComPtr return pInterface; } - //--------------------------------------------------------------------- + void release() { if (m_pInterface) @@ -175,7 +175,7 @@ class ComPtr } #ifndef __MINGW32__ - //--------------------------------------------------------------------- + template< class T_QUERYINTERFACE > HRESULT query(T_QUERYINTERFACE** pQuery) { @@ -183,7 +183,7 @@ class ComPtr } #endif - //--------------------------------------------------------------------- + ::sal_Bool equals(IUnknown* pCheck) { if ( @@ -201,7 +201,7 @@ class ComPtr return bEquals; } - //--------------------------------------------------------------------- + ::sal_Bool is() { return (m_pInterface != 0); diff --git a/fpicker/source/win32/filepicker/controlaccess.cxx b/fpicker/source/win32/filepicker/controlaccess.cxx index 6be5e1dc03c2..79bacd63d709 100644 --- a/fpicker/source/win32/filepicker/controlaccess.cxx +++ b/fpicker/source/win32/filepicker/controlaccess.cxx @@ -108,7 +108,7 @@ namespace // private }; - // + CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction( @@ -123,7 +123,7 @@ namespace // private } - // + CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( @@ -138,7 +138,7 @@ namespace // private } - // + inline @@ -148,7 +148,7 @@ namespace // private } - // + inline @@ -174,7 +174,7 @@ namespace // private }; // end namespace -// + CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction( CTRL_CLASS aCtrlClass, sal_Int16 aCtrlAction ) @@ -189,7 +189,7 @@ CTRL_SETVALUE_FUNCTION_T SAL_CALL GetCtrlSetValueFunction( CTRL_CLASS aCtrlClass } -// + CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( CTRL_CLASS aCtrlClass, sal_Int16 aCtrlAction ) @@ -204,7 +204,7 @@ CTRL_GETVALUE_FUNCTION_T SAL_CALL GetCtrlGetValueFunction( CTRL_CLASS aCtrlClass } -// + CTRL_CLASS SAL_CALL GetCtrlClass( HWND hwndCtrl ) @@ -235,7 +235,7 @@ CTRL_CLASS SAL_CALL GetCtrlClass( HWND hwndCtrl ) } -// + int SAL_CALL CommonFilePickerCtrlIdToWinFileOpenCtrlId( sal_Int16 aControlId ) diff --git a/fpicker/source/win32/filepicker/controlcommand.cxx b/fpicker/source/win32/filepicker/controlcommand.cxx index 6ef55b9e110f..25225d587806 100644 --- a/fpicker/source/win32/filepicker/controlcommand.cxx +++ b/fpicker/source/win32/filepicker/controlcommand.cxx @@ -23,7 +23,7 @@ #include "filepickerstate.hxx" -// + CControlCommand::CControlCommand( sal_Int16 aControlId ) : @@ -33,7 +33,7 @@ CControlCommand::CControlCommand( sal_Int16 aControlId ) : } -// + CControlCommand::~CControlCommand( ) @@ -41,7 +41,7 @@ CControlCommand::~CControlCommand( ) } -// + CControlCommandResult* SAL_CALL CControlCommand::handleRequest( CControlCommandRequest* pRequest ) @@ -69,7 +69,7 @@ CControlCommandResult* SAL_CALL CControlCommand::handleRequest( CControlCommandR } -// + CControlCommand* SAL_CALL CControlCommand::getNextCommand( ) const @@ -78,7 +78,7 @@ CControlCommand* SAL_CALL CControlCommand::getNextCommand( ) const } -// + void SAL_CALL CControlCommand::setNextCommand( CControlCommand* nextCommand ) @@ -87,7 +87,7 @@ void SAL_CALL CControlCommand::setNextCommand( CControlCommand* nextCommand ) } -// + sal_Int16 SAL_CALL CControlCommand::getControlId( ) const @@ -97,7 +97,7 @@ sal_Int16 SAL_CALL CControlCommand::getControlId( ) const -// + CValueControlCommand::CValueControlCommand( @@ -111,7 +111,7 @@ CValueControlCommand::CValueControlCommand( } -// + void SAL_CALL CValueControlCommand::exec( CFilePickerState* aFilePickerState ) @@ -125,7 +125,7 @@ void SAL_CALL CValueControlCommand::exec( CFilePickerState* aFilePickerState ) } -// + CControlCommandResult* SAL_CALL CValueControlCommand::handleRequest( CControlCommandRequest* aRequest ) @@ -159,7 +159,7 @@ CControlCommandResult* SAL_CALL CValueControlCommand::handleRequest( CControlCom } -// + sal_Int16 SAL_CALL CValueControlCommand::getControlAction( ) const @@ -168,7 +168,7 @@ sal_Int16 SAL_CALL CValueControlCommand::getControlAction( ) const } -// + ::com::sun::star::uno::Any SAL_CALL CValueControlCommand::getValue( ) const @@ -178,7 +178,7 @@ sal_Int16 SAL_CALL CValueControlCommand::getControlAction( ) const -// + CLabelControlCommand::CLabelControlCommand( @@ -190,7 +190,7 @@ CLabelControlCommand::CLabelControlCommand( } -// + void SAL_CALL CLabelControlCommand::exec( CFilePickerState* aFilePickerState ) @@ -201,7 +201,7 @@ void SAL_CALL CLabelControlCommand::exec( CFilePickerState* aFilePickerState ) } -// + CControlCommandResult* SAL_CALL CLabelControlCommand::handleRequest( CControlCommandRequest* aRequest ) @@ -236,7 +236,7 @@ CControlCommandResult* SAL_CALL CLabelControlCommand::handleRequest( CControlCom } -// + OUString SAL_CALL CLabelControlCommand::getLabel( ) const @@ -245,7 +245,7 @@ OUString SAL_CALL CLabelControlCommand::getLabel( ) const } -// + CEnableControlCommand::CEnableControlCommand( @@ -257,7 +257,7 @@ CEnableControlCommand::CEnableControlCommand( } -// + void SAL_CALL CEnableControlCommand::exec( CFilePickerState* aFilePickerState ) diff --git a/fpicker/source/win32/filepicker/controlcommand.hxx b/fpicker/source/win32/filepicker/controlcommand.hxx index 01063ff901a8..04ba63c8b6e7 100644 --- a/fpicker/source/win32/filepicker/controlcommand.hxx +++ b/fpicker/source/win32/filepicker/controlcommand.hxx @@ -24,17 +24,17 @@ #include <com/sun/star/uno/Any.hxx> #include <rtl/ustring.hxx> -//--------------------------------------------- -// -//--------------------------------------------- + + + class CFilePickerState; class CControlCommandRequest; class CControlCommandResult; -//--------------------------------------------- -// -//--------------------------------------------- + + + class CControlCommand { @@ -65,9 +65,9 @@ private: sal_Int16 m_aControlId; }; -//--------------------------------------------- -// -//--------------------------------------------- + + + class CValueControlCommand : public CControlCommand { @@ -90,9 +90,9 @@ private: ::com::sun::star::uno::Any m_aValue; }; -//--------------------------------------------- -// -//--------------------------------------------- + + + class CLabelControlCommand : public CControlCommand { @@ -111,9 +111,9 @@ private: OUString m_aLabel; }; -//--------------------------------------------- -// -//--------------------------------------------- + + + class CEnableControlCommand : public CControlCommand { diff --git a/fpicker/source/win32/filepicker/controlcommandrequest.hxx b/fpicker/source/win32/filepicker/controlcommandrequest.hxx index 4f53edd06fa3..c85e0a19e27d 100644 --- a/fpicker/source/win32/filepicker/controlcommandrequest.hxx +++ b/fpicker/source/win32/filepicker/controlcommandrequest.hxx @@ -22,9 +22,9 @@ #include <sal/types.h> -//--------------------------------------------- + // declaration -//--------------------------------------------- + class CControlCommandRequest { @@ -47,9 +47,9 @@ private: sal_Int16 m_aControlId; }; -//--------------------------------------------- -// -//--------------------------------------------- + + + class CValueControlCommandRequest : public CControlCommandRequest { diff --git a/fpicker/source/win32/filepicker/controlcommandresult.hxx b/fpicker/source/win32/filepicker/controlcommandresult.hxx index 2853ca9d73ba..5d03e606f7f4 100644 --- a/fpicker/source/win32/filepicker/controlcommandresult.hxx +++ b/fpicker/source/win32/filepicker/controlcommandresult.hxx @@ -24,9 +24,9 @@ #include <com/sun/star/uno/Any.hxx> #include <rtl/ustring.hxx> -//--------------------------------------------- + // declaration -//--------------------------------------------- + class CControlCommandResult { @@ -49,9 +49,9 @@ private: sal_Bool m_bResult; }; -//--------------------------------------------- -// -//--------------------------------------------- + + + class CValueCommandResult : public CControlCommandResult { @@ -71,9 +71,9 @@ private: ::com::sun::star::uno::Any m_aValue; }; -//--------------------------------------------- -// -//--------------------------------------------- + + + class CLabelCommandResult : public CControlCommandResult { diff --git a/fpicker/source/win32/filepicker/customcontrol.cxx b/fpicker/source/win32/filepicker/customcontrol.cxx index 4e21d3f7e267..3acba156b608 100644 --- a/fpicker/source/win32/filepicker/customcontrol.cxx +++ b/fpicker/source/win32/filepicker/customcontrol.cxx @@ -20,7 +20,7 @@ #include "customcontrol.hxx" -// + CCustomControl::~CCustomControl() @@ -28,7 +28,7 @@ CCustomControl::~CCustomControl() } -// + void SAL_CALL CCustomControl::AddControl(CCustomControl*) @@ -37,7 +37,7 @@ void SAL_CALL CCustomControl::AddControl(CCustomControl*) } -// + void SAL_CALL CCustomControl::RemoveControl(CCustomControl*) @@ -46,7 +46,7 @@ void SAL_CALL CCustomControl::RemoveControl(CCustomControl*) } -// + void SAL_CALL CCustomControl::RemoveAllControls() diff --git a/fpicker/source/win32/filepicker/customcontrol.hxx b/fpicker/source/win32/filepicker/customcontrol.hxx index 9aa6aff8ae58..49aadd7aa960 100644 --- a/fpicker/source/win32/filepicker/customcontrol.hxx +++ b/fpicker/source/win32/filepicker/customcontrol.hxx @@ -30,9 +30,9 @@ #pragma warning(pop) #endif -//----------------------------------- -// -//----------------------------------- + + + class CCustomControl { diff --git a/fpicker/source/win32/filepicker/customcontrolcontainer.cxx b/fpicker/source/win32/filepicker/customcontrolcontainer.cxx index 0d6bcdb2b79a..4955c03a8b58 100644 --- a/fpicker/source/win32/filepicker/customcontrolcontainer.cxx +++ b/fpicker/source/win32/filepicker/customcontrolcontainer.cxx @@ -23,7 +23,7 @@ #include <functional> -// + namespace /* private */ @@ -57,7 +57,7 @@ namespace /* private */ } -// + CCustomControlContainer::~CCustomControlContainer() @@ -66,7 +66,7 @@ CCustomControlContainer::~CCustomControlContainer() } -// + void SAL_CALL CCustomControlContainer::Align() @@ -78,7 +78,7 @@ void SAL_CALL CCustomControlContainer::Align() } -// + void SAL_CALL CCustomControlContainer::SetFont(HFONT hFont) @@ -92,7 +92,7 @@ void SAL_CALL CCustomControlContainer::SetFont(HFONT hFont) } -// + void SAL_CALL CCustomControlContainer::AddControl(CCustomControl* aCustomControl) @@ -101,7 +101,7 @@ void SAL_CALL CCustomControlContainer::AddControl(CCustomControl* aCustomControl } -// + void SAL_CALL CCustomControlContainer::RemoveControl(CCustomControl* aCustomControl) @@ -119,7 +119,7 @@ void SAL_CALL CCustomControlContainer::RemoveControl(CCustomControl* aCustomCont } -// + void SAL_CALL CCustomControlContainer::RemoveAllControls() diff --git a/fpicker/source/win32/filepicker/customcontrolcontainer.hxx b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx index 747833c3b663..5eea68099c8b 100644 --- a/fpicker/source/win32/filepicker/customcontrolcontainer.hxx +++ b/fpicker/source/win32/filepicker/customcontrolcontainer.hxx @@ -24,12 +24,12 @@ #include <list> -//----------------------------------- + // A container for custom controls // the container is resposible for // the destruction of the custom // controls -//----------------------------------- + class CCustomControlContainer : public CCustomControl { diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.cxx b/fpicker/source/win32/filepicker/customcontrolfactory.cxx index 9d1fbf357e1a..3ec33606134e 100644 --- a/fpicker/source/win32/filepicker/customcontrolfactory.cxx +++ b/fpicker/source/win32/filepicker/customcontrolfactory.cxx @@ -25,7 +25,7 @@ #include <osl/diagnose.h> -// + CCustomControl* CCustomControlFactory::CreateCustomControl(HWND aControlHandle, HWND aParentHandle) @@ -67,7 +67,7 @@ CCustomControl* CCustomControlFactory::CreateCustomControl(HWND aControlHandle, } -// + CCustomControl* CCustomControlFactory::CreateCustomControlContainer() diff --git a/fpicker/source/win32/filepicker/customcontrolfactory.hxx b/fpicker/source/win32/filepicker/customcontrolfactory.hxx index 46da0e01c9e8..e10a1b58db28 100644 --- a/fpicker/source/win32/filepicker/customcontrolfactory.hxx +++ b/fpicker/source/win32/filepicker/customcontrolfactory.hxx @@ -28,15 +28,15 @@ #pragma warning(pop) #endif -//----------------------------------- + // forward declaration -//----------------------------------- + class CCustomControl; -//----------------------------------- -// -//----------------------------------- + + + class CCustomControlFactory { diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx index 32a5646faab4..859847ffabed 100644 --- a/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx +++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.cxx @@ -21,7 +21,7 @@ #include <osl/diagnose.h> -// + CDialogCustomControlBase::CDialogCustomControlBase(HWND aControlHandle, HWND aParentHandle) : @@ -31,7 +31,7 @@ CDialogCustomControlBase::CDialogCustomControlBase(HWND aControlHandle, HWND aPa } -// + void SAL_CALL CDialogCustomControlBase::SetFont(HFONT hFont) @@ -44,7 +44,7 @@ void SAL_CALL CDialogCustomControlBase::SetFont(HFONT hFont) } -// + void SAL_CALL CDialogCustomControlBase::AlignToBuddy(HWND aBuddyHandle) @@ -80,7 +80,7 @@ void SAL_CALL CDialogCustomControlBase::AlignToBuddy(HWND aBuddyHandle) } -// + CDummyCustomControl::CDummyCustomControl(HWND, HWND) @@ -88,7 +88,7 @@ CDummyCustomControl::CDummyCustomControl(HWND, HWND) } -// + void SAL_CALL CDummyCustomControl::Align() @@ -97,7 +97,7 @@ void SAL_CALL CDummyCustomControl::Align() } -// + void SAL_CALL CDummyCustomControl::SetFont(HFONT) @@ -106,7 +106,7 @@ void SAL_CALL CDummyCustomControl::SetFont(HFONT) } -// + CStaticCustomControl::CStaticCustomControl(HWND aControlHandle, HWND aParentHandle) : @@ -125,7 +125,7 @@ void SAL_CALL CStaticCustomControl::Align() } -// + CPushButtonCustomControl::CPushButtonCustomControl(HWND aControlHandle, HWND aParentHandle) : @@ -144,7 +144,7 @@ void SAL_CALL CPushButtonCustomControl::Align() } -// + CComboboxCustomControl::CComboboxCustomControl(HWND aControlHandle, HWND aParentHandle) : @@ -163,7 +163,7 @@ void SAL_CALL CComboboxCustomControl::Align() } -// + CCheckboxCustomControl::CCheckboxCustomControl(HWND aControlHandle, HWND aParentHandle) : diff --git a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx index e51cb8970aa4..fbe233512e63 100644 --- a/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx +++ b/fpicker/source/win32/filepicker/dialogcustomcontrols.hxx @@ -30,9 +30,9 @@ #pragma warning(pop) #endif -//----------------------------------- -// -//----------------------------------- + + + class CDummyCustomControl : public CCustomControl { @@ -43,9 +43,9 @@ public: virtual void SAL_CALL SetFont(HFONT hFont); }; -//----------------------------------- -// -//----------------------------------- + + + class CDialogCustomControlBase : public CCustomControl { @@ -56,7 +56,7 @@ protected: // aligns the specific control class to a reference // buddy - // + void SAL_CALL AlignToBuddy(HWND aBuddyHandle); protected: @@ -64,9 +64,9 @@ protected: HWND m_ParentHandle; }; -//----------------------------------- -// -//----------------------------------- + + + class CStaticCustomControl : public CDialogCustomControlBase { @@ -76,9 +76,9 @@ public: virtual void SAL_CALL Align(); }; -//----------------------------------- -// -//----------------------------------- + + + class CPushButtonCustomControl : public CDialogCustomControlBase { @@ -88,9 +88,9 @@ public: virtual void SAL_CALL Align(); }; -//----------------------------------- -// -//----------------------------------- + + + class CComboboxCustomControl : public CDialogCustomControlBase { @@ -100,9 +100,9 @@ public: virtual void SAL_CALL Align(); }; -//----------------------------------- -// -//----------------------------------- + + + class CCheckboxCustomControl : public CDialogCustomControlBase { diff --git a/fpicker/source/win32/filepicker/dibpreview.cxx b/fpicker/source/win32/filepicker/dibpreview.cxx index 66f46efff1e4..149fd571af57 100644 --- a/fpicker/source/win32/filepicker/dibpreview.cxx +++ b/fpicker/source/win32/filepicker/dibpreview.cxx @@ -29,7 +29,7 @@ #include <string> -// + using ::com::sun::star::uno::Sequence; @@ -38,7 +38,7 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::lang::IllegalArgumentException; -// + namespace /* private */ @@ -57,7 +57,7 @@ ATOM CDIBPreview::s_ClassAtom = 0; sal_Int32 CDIBPreview::s_RegisterDibPreviewWndCount = 0; -// + CDIBPreview::CDIBPreview(HINSTANCE instance,HWND parent,sal_Bool bShowWindow) : @@ -96,7 +96,7 @@ CDIBPreview::CDIBPreview(HINSTANCE instance,HWND parent,sal_Bool bShowWindow) : } -// + CDIBPreview::~CDIBPreview( ) @@ -110,7 +110,7 @@ CDIBPreview::~CDIBPreview( ) } -// + sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException) @@ -125,7 +125,7 @@ sal_Int32 SAL_CALL CDIBPreview::getTargetColorDepth() throw (RuntimeException) } -// + sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException) @@ -142,7 +142,7 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableWidth() throw (RuntimeException) } -// + sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException) @@ -159,7 +159,7 @@ sal_Int32 SAL_CALL CDIBPreview::getAvailableHeight() throw (RuntimeException) } -// + void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage) @@ -182,7 +182,7 @@ void SAL_CALL CDIBPreview::setImage(sal_Int16 aImageFormat, const Any& aImage) } -// + sal_Bool SAL_CALL CDIBPreview::setShowState(sal_Bool bShowState) throw (RuntimeException) @@ -193,7 +193,7 @@ sal_Bool SAL_CALL CDIBPreview::setShowState(sal_Bool bShowState) throw (RuntimeE } -// + sal_Bool SAL_CALL CDIBPreview::getShowState() throw (RuntimeException) @@ -202,7 +202,7 @@ sal_Bool SAL_CALL CDIBPreview::getShowState() throw (RuntimeException) } -// + HWND SAL_CALL CDIBPreview::getWindowHandle() const @@ -211,7 +211,7 @@ HWND SAL_CALL CDIBPreview::getWindowHandle() const } -// + void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC) @@ -307,7 +307,7 @@ void SAL_CALL CDIBPreview::onPaint(HWND hWnd, HDC hDC) } -// + LRESULT CALLBACK CDIBPreview::WndProc( @@ -375,7 +375,7 @@ LRESULT CALLBACK CDIBPreview::WndProc( } -// + ATOM SAL_CALL CDIBPreview::RegisterDibPreviewWindowClass() @@ -418,7 +418,7 @@ ATOM SAL_CALL CDIBPreview::RegisterDibPreviewWindowClass() } -// + void SAL_CALL CDIBPreview::UnregisterDibPreviewWindowClass() diff --git a/fpicker/source/win32/filepicker/dibpreview.hxx b/fpicker/source/win32/filepicker/dibpreview.hxx index e63a3c8ad392..61d338f8c0f2 100644 --- a/fpicker/source/win32/filepicker/dibpreview.hxx +++ b/fpicker/source/win32/filepicker/dibpreview.hxx @@ -31,7 +31,7 @@ #pragma warning(pop) #endif -//--------------------------------------------- + // A very simple wrapper for a window that does // display DIBs. // Maybe it would be better and more extensible @@ -39,7 +39,7 @@ // for rendering a specific image format into // the area of the window, but for our purpose // it's enough to go the simple way - KISS. -//--------------------------------------------- + class CDIBPreview : public PreviewBase { diff --git a/fpicker/source/win32/filepicker/eventnotification.hxx b/fpicker/source/win32/filepicker/eventnotification.hxx index 33a9db0877b9..209343526218 100644 --- a/fpicker/source/win32/filepicker/eventnotification.hxx +++ b/fpicker/source/win32/filepicker/eventnotification.hxx @@ -23,14 +23,14 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/Reference.hxx> -//----------------------------------- + // encapsulate a filepicker event // notification, because there are // two types of filepicker notifications // with and without parameter // this is an application of the // "command" pattern see GoF -//----------------------------------- + class CEventNotification { diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.cxx b/fpicker/source/win32/filepicker/filepickereventnotification.cxx index 275f4f59920b..e62a3c4beb03 100644 --- a/fpicker/source/win32/filepicker/filepickereventnotification.cxx +++ b/fpicker/source/win32/filepicker/filepickereventnotification.cxx @@ -38,7 +38,7 @@ CFilePickerEventNotification::CFilePickerEventNotification(EventListenerMethod_t } -// + void SAL_CALL CFilePickerEventNotification::notifyEventListener( Reference< XInterface > xListener ) @@ -49,7 +49,7 @@ void SAL_CALL CFilePickerEventNotification::notifyEventListener( Reference< XInt } -//################################################## + diff --git a/fpicker/source/win32/filepicker/filepickereventnotification.hxx b/fpicker/source/win32/filepicker/filepickereventnotification.hxx index a786300aa557..e33523c80e80 100644 --- a/fpicker/source/win32/filepicker/filepickereventnotification.hxx +++ b/fpicker/source/win32/filepicker/filepickereventnotification.hxx @@ -24,10 +24,10 @@ #include <com/sun/star/ui/dialogs/XFilePickerListener.hpp> #include <com/sun/star/ui/dialogs/FilePickerEvent.hpp> -//----------------------------------- + // A FilePicker event without // parameter -//----------------------------------- + class CFilePickerEventNotification : public CEventNotification { @@ -43,9 +43,9 @@ private: EventListenerMethod_t m_EventListenerMethod; }; -//---------------------------------- + // A FilePicker event with parameter -//---------------------------------- + class CFilePickerParamEventNotification : public CEventNotification { diff --git a/fpicker/source/win32/filepicker/filepickerstate.cxx b/fpicker/source/win32/filepicker/filepickerstate.cxx index 971f44c1e7ea..2e0967aec361 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.cxx +++ b/fpicker/source/win32/filepicker/filepickerstate.cxx @@ -35,7 +35,7 @@ #include "../misc/WinImplHelper.hxx" -// + using com::sun::star::uno::Any; @@ -48,7 +48,7 @@ using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::ListboxControlActions; -// + const sal_Int32 MAX_LABEL = 256; @@ -63,7 +63,7 @@ CFilePickerState::~CFilePickerState( ) } -// + CNonExecuteFilePickerState::CNonExecuteFilePickerState( ) : @@ -72,7 +72,7 @@ CNonExecuteFilePickerState::CNonExecuteFilePickerState( ) : } -// + CNonExecuteFilePickerState::~CNonExecuteFilePickerState( ) @@ -81,7 +81,7 @@ CNonExecuteFilePickerState::~CNonExecuteFilePickerState( ) } -// + void SAL_CALL CNonExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const Any& aValue ) @@ -93,7 +93,7 @@ void SAL_CALL CNonExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_In } -// + Any SAL_CALL CNonExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) @@ -136,7 +136,7 @@ Any SAL_CALL CNonExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int } -// + void SAL_CALL CNonExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_Bool bEnable ) @@ -148,7 +148,7 @@ void SAL_CALL CNonExecuteFilePickerState::enableControl( sal_Int16 aControlId, s } -// + void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel ) @@ -160,7 +160,7 @@ void SAL_CALL CNonExecuteFilePickerState::setLabel( sal_Int16 aControlId, const } -// + OUString SAL_CALL CNonExecuteFilePickerState::getLabel( sal_Int16 aControlId ) @@ -204,7 +204,7 @@ OUString MatchFixBrokenPath(const OUString& path) } -// + static OUString trimTrailingSpaces(const OUString& rString) { @@ -282,7 +282,7 @@ Sequence< OUString > SAL_CALL CNonExecuteFilePickerState::getFiles( CFileOpenDia } -// + OUString SAL_CALL CNonExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) @@ -301,7 +301,7 @@ OUString SAL_CALL CNonExecuteFilePickerState::getDisplayDirectory( CFileOpenDial } -// + void SAL_CALL CNonExecuteFilePickerState::reset( ) @@ -320,7 +320,7 @@ void SAL_CALL CNonExecuteFilePickerState::reset( ) } -// + CControlCommand* SAL_CALL CNonExecuteFilePickerState::getControlCommand( ) const @@ -353,10 +353,10 @@ void SAL_CALL CNonExecuteFilePickerState::addControlCommand( CControlCommand* aC } } -//####################################################################### -// + + CExecuteFilePickerState::CExecuteFilePickerState( HWND hwndDlg ) : @@ -365,7 +365,7 @@ CExecuteFilePickerState::CExecuteFilePickerState( HWND hwndDlg ) : } -// + void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 aControlAction, const Any& aValue ) @@ -407,7 +407,7 @@ void SAL_CALL CExecuteFilePickerState::setValue( sal_Int16 aControlId, sal_Int16 } -// + Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 aControlAction ) @@ -446,7 +446,7 @@ Any SAL_CALL CExecuteFilePickerState::getValue( sal_Int16 aControlId, sal_Int16 } -// + void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_Bool bEnable ) @@ -459,7 +459,7 @@ void SAL_CALL CExecuteFilePickerState::enableControl( sal_Int16 aControlId, sal_ } -// + void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUString& aLabel ) @@ -479,7 +479,7 @@ void SAL_CALL CExecuteFilePickerState::setLabel( sal_Int16 aControlId, const OUS } -// + OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId ) @@ -504,7 +504,7 @@ OUString SAL_CALL CExecuteFilePickerState::getLabel( sal_Int16 aControlId ) } -// + Sequence< OUString > SAL_CALL CExecuteFilePickerState::getFiles( CFileOpenDialog* aFileOpenDialog ) @@ -540,7 +540,7 @@ Sequence< OUString > SAL_CALL CExecuteFilePickerState::getFiles( CFileOpenDialog } -// + OUString SAL_CALL CExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) @@ -559,7 +559,7 @@ OUString SAL_CALL CExecuteFilePickerState::getDisplayDirectory( CFileOpenDialog* } -// + void SAL_CALL CExecuteFilePickerState::initFilePickerControls( CControlCommand* firstControlCommand ) @@ -574,7 +574,7 @@ void SAL_CALL CExecuteFilePickerState::initFilePickerControls( CControlCommand* } -// + void SAL_CALL CExecuteFilePickerState::cacheControlState( HWND hwndControl, CFilePickerState* aNonExecFilePickerState ) @@ -632,7 +632,7 @@ void SAL_CALL CExecuteFilePickerState::cacheControlState( HWND hwndControl, CFil } -// + void SAL_CALL CExecuteFilePickerState::setHwnd( HWND hwndDlg ) @@ -641,7 +641,7 @@ void SAL_CALL CExecuteFilePickerState::setHwnd( HWND hwndDlg ) } -// + inline sal_Bool SAL_CALL CExecuteFilePickerState::IsListboxControl( HWND hwndControl ) const @@ -666,7 +666,7 @@ inline sal_Int16 SAL_CALL CExecuteFilePickerState::ListboxIdToListboxLabelId( sa } -// + inline HWND SAL_CALL CExecuteFilePickerState::GetListboxLabelItem( sal_Int16 aControlId ) const @@ -680,7 +680,7 @@ inline HWND SAL_CALL CExecuteFilePickerState::GetListboxLabelItem( sal_Int16 aCo } -// + HWND SAL_CALL CExecuteFilePickerState::GetHwndDlgItem( sal_Int16 aControlId, sal_Bool bIncludeStdCtrls ) const diff --git a/fpicker/source/win32/filepicker/filepickerstate.hxx b/fpicker/source/win32/filepicker/filepickerstate.hxx index 414dd3360792..d0be2441a855 100644 --- a/fpicker/source/win32/filepicker/filepickerstate.hxx +++ b/fpicker/source/win32/filepicker/filepickerstate.hxx @@ -34,16 +34,16 @@ #if defined _MSC_VER #pragma warning(pop) #endif -//--------------------------------------------- -// -//--------------------------------------------- + + + class CControlCommand; class CFileOpenDialog; -//--------------------------------------------- + // declaration -//--------------------------------------------- + class CFilePickerState { @@ -65,9 +65,9 @@ public: virtual OUString SAL_CALL getDisplayDirectory( CFileOpenDialog* aFileOpenDialog ) = 0; }; -//--------------------------------------------- + // this class is not thread-safe -//--------------------------------------------- + class CNonExecuteFilePickerState : public CFilePickerState { @@ -101,9 +101,9 @@ private: CControlCommand* m_FirstControlCommand; }; -//--------------------------------------------- + // this class is not thread-safe -//--------------------------------------------- + class CExecuteFilePickerState : public CFilePickerState { diff --git a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx index 48ed997c3645..84c0b6f5f275 100644 --- a/fpicker/source/win32/filepicker/getfilenamewrapper.cxx +++ b/fpicker/source/win32/filepicker/getfilenamewrapper.cxx @@ -107,7 +107,7 @@ namespace /* private */ }; - // + struct GetFileNameParam @@ -126,7 +126,7 @@ namespace /* private */ }; - // + unsigned __stdcall ThreadProc(void* pParam) @@ -197,7 +197,7 @@ namespace /* private */ -// + CGetFileNameWrapper::CGetFileNameWrapper() : @@ -206,7 +206,7 @@ CGetFileNameWrapper::CGetFileNameWrapper() : } -// + bool CGetFileNameWrapper::getOpenFileName(LPOPENFILENAME lpofn) @@ -237,7 +237,7 @@ bool CGetFileNameWrapper::getOpenFileName(LPOPENFILENAME lpofn) } -// + bool CGetFileNameWrapper::getSaveFileName(LPOPENFILENAME lpofn) @@ -263,7 +263,7 @@ bool CGetFileNameWrapper::getSaveFileName(LPOPENFILENAME lpofn) } -// + int CGetFileNameWrapper::commDlgExtendedError( ) diff --git a/fpicker/source/win32/filepicker/helppopupwindow.cxx b/fpicker/source/win32/filepicker/helppopupwindow.cxx index 3af46a0cc94c..8cdbdf449ed9 100644 --- a/fpicker/source/win32/filepicker/helppopupwindow.cxx +++ b/fpicker/source/win32/filepicker/helppopupwindow.cxx @@ -22,13 +22,13 @@ #include <osl/diagnose.h> -// + using osl::Mutex; -// + namespace /* private */ @@ -63,7 +63,7 @@ ATOM CHelpPopupWindow::s_ClassAtom = 0; sal_Int32 CHelpPopupWindow::s_RegisterWndClassCount = 0; -// + CHelpPopupWindow::CHelpPopupWindow( @@ -89,7 +89,7 @@ CHelpPopupWindow::CHelpPopupWindow( } -// + CHelpPopupWindow::~CHelpPopupWindow( ) @@ -106,7 +106,7 @@ CHelpPopupWindow::~CHelpPopupWindow( ) } -// + void SAL_CALL CHelpPopupWindow::setText( const OUString& aHelpText ) @@ -115,7 +115,7 @@ void SAL_CALL CHelpPopupWindow::setText( const OUString& aHelpText ) } -// + void SAL_CALL CHelpPopupWindow::show( sal_Int32 x, sal_Int32 y ) @@ -154,7 +154,7 @@ void SAL_CALL CHelpPopupWindow::show( sal_Int32 x, sal_Int32 y ) } -// + HWND SAL_CALL CHelpPopupWindow::setParent( HWND hwndNewParent ) @@ -216,7 +216,7 @@ void SAL_CALL CHelpPopupWindow::calcWindowRect( LPRECT lprect ) } -// + void SAL_CALL CHelpPopupWindow::adjustWindowSize( sal_Int32* cx_new, sal_Int32* cy_new ) @@ -241,7 +241,7 @@ void SAL_CALL CHelpPopupWindow::adjustWindowSize( sal_Int32* cx_new, sal_Int32* } -// + void SAL_CALL CHelpPopupWindow::adjustWindowPos( @@ -290,7 +290,7 @@ void SAL_CALL CHelpPopupWindow::adjustWindowPos( } -// + void SAL_CALL CHelpPopupWindow::onPaint( HWND hWnd, HDC hdc ) @@ -410,7 +410,7 @@ void SAL_CALL CHelpPopupWindow::onPaint( HWND hWnd, HDC hdc ) } -// + void SAL_CALL CHelpPopupWindow::onNcDestroy() @@ -419,7 +419,7 @@ void SAL_CALL CHelpPopupWindow::onNcDestroy() } -// + void SAL_CALL CHelpPopupWindow::onCreate( HWND hwnd ) @@ -449,7 +449,7 @@ void SAL_CALL CHelpPopupWindow::onCreate( HWND hwnd ) } -// + LRESULT CALLBACK CHelpPopupWindow::WndProc( @@ -523,7 +523,7 @@ LRESULT CALLBACK CHelpPopupWindow::WndProc( } -// + ATOM SAL_CALL CHelpPopupWindow::RegisterWindowClass( ) @@ -563,7 +563,7 @@ ATOM SAL_CALL CHelpPopupWindow::RegisterWindowClass( ) } -// + void SAL_CALL CHelpPopupWindow::UnregisterWindowClass( ) diff --git a/fpicker/source/win32/filepicker/helppopupwindow.hxx b/fpicker/source/win32/filepicker/helppopupwindow.hxx index ae0179a70796..e8fcd27801c7 100644 --- a/fpicker/source/win32/filepicker/helppopupwindow.hxx +++ b/fpicker/source/win32/filepicker/helppopupwindow.hxx @@ -33,9 +33,9 @@ #pragma warning(pop) #endif -//--------------------------------------------- + // declaration -//--------------------------------------------- + /* A simple popup window similary to the one the diff --git a/fpicker/source/win32/filepicker/previewadapter.cxx b/fpicker/source/win32/filepicker/previewadapter.cxx index c87f3b858479..df66893c9a54 100644 --- a/fpicker/source/win32/filepicker/previewadapter.cxx +++ b/fpicker/source/win32/filepicker/previewadapter.cxx @@ -29,7 +29,7 @@ #include <stdexcept> -// + using namespace ::com::sun::star::uno; @@ -97,7 +97,7 @@ private: }; -// + CPreviewAdapterImpl::CPreviewAdapterImpl(HINSTANCE instance) : @@ -109,7 +109,7 @@ CPreviewAdapterImpl::CPreviewAdapterImpl(HINSTANCE instance) : } -// + CPreviewAdapterImpl::~CPreviewAdapterImpl() @@ -117,7 +117,7 @@ CPreviewAdapterImpl::~CPreviewAdapterImpl() } -// + sal_Int32 SAL_CALL CPreviewAdapterImpl::getTargetColorDepth() @@ -126,7 +126,7 @@ sal_Int32 SAL_CALL CPreviewAdapterImpl::getTargetColorDepth() } -// + sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableWidth() @@ -135,7 +135,7 @@ sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableWidth() } -// + sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableHeight() @@ -144,7 +144,7 @@ sal_Int32 SAL_CALL CPreviewAdapterImpl::getAvailableHeight() } -// + void SAL_CALL CPreviewAdapterImpl::setImage( sal_Int16 aImageFormat, const Any& aImage ) @@ -154,7 +154,7 @@ void SAL_CALL CPreviewAdapterImpl::setImage( sal_Int16 aImageFormat, const Any& } -// + sal_Bool SAL_CALL CPreviewAdapterImpl::setShowState( sal_Bool bShowState ) @@ -165,7 +165,7 @@ sal_Bool SAL_CALL CPreviewAdapterImpl::setShowState( sal_Bool bShowState ) } -// + sal_Bool SAL_CALL CPreviewAdapterImpl::getShowState() @@ -174,7 +174,7 @@ sal_Bool SAL_CALL CPreviewAdapterImpl::getShowState() } -// + void SAL_CALL CPreviewAdapterImpl::setParent(HWND parent) @@ -186,7 +186,7 @@ void SAL_CALL CPreviewAdapterImpl::setParent(HWND parent) } -// + HWND SAL_CALL CPreviewAdapterImpl::getParent() @@ -195,13 +195,13 @@ HWND SAL_CALL CPreviewAdapterImpl::getParent() } -// + void SAL_CALL CPreviewAdapterImpl::calcRightMargin() { // Calculate the right reference margin - // + // Assumtions: // 1. This method will be called before the dialog becomes // visible @@ -227,7 +227,7 @@ void SAL_CALL CPreviewAdapterImpl::calcRightMargin() } -// + void SAL_CALL CPreviewAdapterImpl::notifyParentShow(sal_Bool) @@ -235,7 +235,7 @@ void SAL_CALL CPreviewAdapterImpl::notifyParentShow(sal_Bool) } -// + void SAL_CALL CPreviewAdapterImpl::notifyParentSizeChanged() @@ -244,7 +244,7 @@ void SAL_CALL CPreviewAdapterImpl::notifyParentSizeChanged() } -// + void SAL_CALL CPreviewAdapterImpl::notifyParentWindowPosChanged() @@ -252,7 +252,7 @@ void SAL_CALL CPreviewAdapterImpl::notifyParentWindowPosChanged() } -// + void SAL_CALL CPreviewAdapterImpl::rearrangeLayout() @@ -347,7 +347,7 @@ void SAL_CALL CPreviewAdapterImpl::rearrangeLayout() } -// + void SAL_CALL CPreviewAdapterImpl::initializeActivePreview() throw(std::runtime_error) @@ -369,7 +369,7 @@ void SAL_CALL CPreviewAdapterImpl::initializeActivePreview() throw(std::runtime_ } -// + HWND SAL_CALL CPreviewAdapterImpl::findFileListbox() const @@ -389,13 +389,13 @@ HWND SAL_CALL CPreviewAdapterImpl::findFileListbox() const } -//############################################################## + // Implementation for Windows 95/NT/ME/2000/XP // because: -// + class CWin95NTPreviewAdapterImpl : public CPreviewAdapterImpl @@ -407,7 +407,7 @@ public: }; -// + CWin95NTPreviewAdapterImpl::CWin95NTPreviewAdapterImpl(HINSTANCE instance) : @@ -416,7 +416,7 @@ CWin95NTPreviewAdapterImpl::CWin95NTPreviewAdapterImpl(HINSTANCE instance) : } -// + void SAL_CALL CWin95NTPreviewAdapterImpl::notifyParentShow(sal_Bool bShow) @@ -435,7 +435,7 @@ void SAL_CALL CWin95NTPreviewAdapterImpl::notifyParentShow(sal_Bool bShow) } -//############################################################## + @@ -448,7 +448,7 @@ CPreviewAdapter::CPreviewAdapter(HINSTANCE instance) } -// + CPreviewAdapter::~CPreviewAdapter() @@ -456,7 +456,7 @@ CPreviewAdapter::~CPreviewAdapter() } -// + Sequence<sal_Int16> SAL_CALL CPreviewAdapter::getSupportedImageFormats() @@ -467,7 +467,7 @@ Sequence<sal_Int16> SAL_CALL CPreviewAdapter::getSupportedImageFormats() } -// + sal_Int32 SAL_CALL CPreviewAdapter::getTargetColorDepth() @@ -476,7 +476,7 @@ sal_Int32 SAL_CALL CPreviewAdapter::getTargetColorDepth() } -// + sal_Int32 SAL_CALL CPreviewAdapter::getAvailableWidth() @@ -485,7 +485,7 @@ sal_Int32 SAL_CALL CPreviewAdapter::getAvailableWidth() } -// + sal_Int32 SAL_CALL CPreviewAdapter::getAvailableHeight() @@ -494,7 +494,7 @@ sal_Int32 SAL_CALL CPreviewAdapter::getAvailableHeight() } -// + void SAL_CALL CPreviewAdapter::setImage( sal_Int16 aImageFormat, const Any& aImage ) @@ -504,7 +504,7 @@ void SAL_CALL CPreviewAdapter::setImage( sal_Int16 aImageFormat, const Any& aIma } -// + sal_Bool SAL_CALL CPreviewAdapter::setShowState( sal_Bool bShowState ) @@ -513,7 +513,7 @@ sal_Bool SAL_CALL CPreviewAdapter::setShowState( sal_Bool bShowState ) } -// + sal_Bool SAL_CALL CPreviewAdapter::getShowState() @@ -522,7 +522,7 @@ sal_Bool SAL_CALL CPreviewAdapter::getShowState() } -// + void SAL_CALL CPreviewAdapter::setParent(HWND parent) @@ -531,7 +531,7 @@ void SAL_CALL CPreviewAdapter::setParent(HWND parent) } -// + void SAL_CALL CPreviewAdapter::notifyParentShow(bool bShow) @@ -540,7 +540,7 @@ void SAL_CALL CPreviewAdapter::notifyParentShow(bool bShow) } -// + void SAL_CALL CPreviewAdapter::notifyParentSizeChanged() @@ -549,7 +549,7 @@ void SAL_CALL CPreviewAdapter::notifyParentSizeChanged() } -// + void SAL_CALL CPreviewAdapter::notifyParentWindowPosChanged() diff --git a/fpicker/source/win32/filepicker/previewadapter.hxx b/fpicker/source/win32/filepicker/previewadapter.hxx index 372197fc2764..5eaf9bce0b35 100644 --- a/fpicker/source/win32/filepicker/previewadapter.hxx +++ b/fpicker/source/win32/filepicker/previewadapter.hxx @@ -38,7 +38,7 @@ // forward declaration class CPreviewAdapterImpl; -//--------------------------------------------- + // A kind of a facade for the preview class. // We want to hide the fact that the preview // window may only become visible if there is @@ -46,7 +46,7 @@ class CPreviewAdapterImpl; // is in execution mode. So unless someone sets // the preview active with a valid parent // window the preview may not be visible -//--------------------------------------------- + class CPreviewAdapter { @@ -74,9 +74,9 @@ public: void SAL_CALL setParent(HWND parent); - //-------------------------------------- + // notification from parent - //-------------------------------------- + void SAL_CALL notifyParentShow(bool bShow); diff --git a/fpicker/source/win32/filepicker/previewbase.cxx b/fpicker/source/win32/filepicker/previewbase.cxx index 97f5b7d4974f..e745c60c3da4 100644 --- a/fpicker/source/win32/filepicker/previewbase.cxx +++ b/fpicker/source/win32/filepicker/previewbase.cxx @@ -26,7 +26,7 @@ using namespace com::sun::star::lang; -// + PreviewBase::PreviewBase() : @@ -36,7 +36,7 @@ PreviewBase::PreviewBase() : } -// + PreviewBase::~PreviewBase() @@ -44,7 +44,7 @@ PreviewBase::~PreviewBase() } -// + sal_Int32 SAL_CALL PreviewBase::getTargetColorDepth() throw (RuntimeException) @@ -53,7 +53,7 @@ sal_Int32 SAL_CALL PreviewBase::getTargetColorDepth() throw (RuntimeException) } -// + sal_Int32 SAL_CALL PreviewBase::getAvailableWidth() throw (RuntimeException) @@ -62,7 +62,7 @@ sal_Int32 SAL_CALL PreviewBase::getAvailableWidth() throw (RuntimeException) } -// + sal_Int32 SAL_CALL PreviewBase::getAvailableHeight() throw (RuntimeException) @@ -71,7 +71,7 @@ sal_Int32 SAL_CALL PreviewBase::getAvailableHeight() throw (RuntimeException) } -// + void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::star::uno::Any& aImage ) @@ -91,7 +91,7 @@ void SAL_CALL PreviewBase::setImage( sal_Int16 aImageFormat, const ::com::sun::s } -// + void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,com::sun::star::uno::Any& aImage) @@ -101,7 +101,7 @@ void SAL_CALL PreviewBase::getImage(sal_Int16& aImageFormat,com::sun::star::uno: } -// + sal_Bool SAL_CALL PreviewBase::setShowState( sal_Bool bShowState ) throw (RuntimeException) @@ -111,7 +111,7 @@ sal_Bool SAL_CALL PreviewBase::setShowState( sal_Bool bShowState ) throw (Runtim } -// + sal_Bool SAL_CALL PreviewBase::getShowState() throw (RuntimeException) @@ -120,7 +120,7 @@ sal_Bool SAL_CALL PreviewBase::getShowState() throw (RuntimeException) } -// + sal_Bool SAL_CALL PreviewBase::getImaginaryShowState() const @@ -129,7 +129,7 @@ sal_Bool SAL_CALL PreviewBase::getImaginaryShowState() const } -// + HWND SAL_CALL PreviewBase::getWindowHandle() const diff --git a/fpicker/source/win32/filepicker/previewbase.hxx b/fpicker/source/win32/filepicker/previewbase.hxx index 024bf1c7e19e..220fdb7f6433 100644 --- a/fpicker/source/win32/filepicker/previewbase.hxx +++ b/fpicker/source/win32/filepicker/previewbase.hxx @@ -34,9 +34,9 @@ #pragma warning(pop) #endif -//--------------------------------------------- + // Common interface for previews -//--------------------------------------------- + class PreviewBase { diff --git a/fpicker/source/win32/filepicker/resource.h b/fpicker/source/win32/filepicker/resource.h index 99fa7f5624f6..c8f5c6324807 100644 --- a/fpicker/source/win32/filepicker/resource.h +++ b/fpicker/source/win32/filepicker/resource.h @@ -20,7 +20,7 @@ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by Fps.rc -// + #define IDD_DIALOG1 101 #define IDB_BITMAP1 117 #define IDB_BITMAP2 118 @@ -29,7 +29,7 @@ #define IDC_STATIC -1 // Next default values for new objects -// + #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 119 diff --git a/fpicker/source/win32/filepicker/vistatypes.h b/fpicker/source/win32/filepicker/vistatypes.h index f7ebd22d9f16..2ca8700b5047 100644 --- a/fpicker/source/win32/filepicker/vistatypes.h +++ b/fpicker/source/win32/filepicker/vistatypes.h @@ -27,9 +27,9 @@ namespace fpicker{ namespace win32{ namespace vista{ -//----------------------------------------------------------------------------- + // types, const etcpp. -//----------------------------------------------------------------------------- + typedef ComPtr< IFileDialog , IID_IFileDialog > TFileDialog; typedef ComPtr< IFileOpenDialog , IID_IFileOpenDialog , CLSID_FileOpenDialog > TFileOpenDialog; diff --git a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx index ed3838b70283..3576aa1467e7 100644 --- a/fpicker/source/win32/filepicker/workbench/Test_fps.cxx +++ b/fpicker/source/win32/filepicker/workbench/Test_fps.cxx @@ -46,9 +46,9 @@ #include "..\FPServiceInfo.hxx" -// + // namesapces -// + using namespace ::rtl ; using namespace ::cppu ; diff --git a/fpicker/source/win32/folderpicker/FolderPicker.cxx b/fpicker/source/win32/folderpicker/FolderPicker.cxx index 58adeeed1cc2..edf26984794b 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.cxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.cxx @@ -58,7 +58,7 @@ namespace } -// + CFolderPicker::CFolderPicker( const Reference< XMultiServiceFactory >& xServiceMgr ) : @@ -68,7 +68,7 @@ CFolderPicker::CFolderPicker( const Reference< XMultiServiceFactory >& xServiceM } -// + void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeException ) @@ -79,7 +79,7 @@ void SAL_CALL CFolderPicker::setTitle( const OUString& aTitle ) throw( RuntimeEx } -// + void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory ) @@ -91,7 +91,7 @@ void SAL_CALL CFolderPicker::setDisplayDirectory( const OUString& aDirectory ) } -// + OUString SAL_CALL CFolderPicker::getDisplayDirectory( ) @@ -103,7 +103,7 @@ OUString SAL_CALL CFolderPicker::getDisplayDirectory( ) } -// + OUString SAL_CALL CFolderPicker::getDirectory( ) throw( RuntimeException ) @@ -114,7 +114,7 @@ OUString SAL_CALL CFolderPicker::getDirectory( ) throw( RuntimeException ) } -// + void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) throw( RuntimeException ) @@ -125,7 +125,7 @@ void SAL_CALL CFolderPicker::setDescription( const OUString& aDescription ) thro } -// + sal_Int16 SAL_CALL CFolderPicker::execute( ) diff --git a/fpicker/source/win32/folderpicker/FolderPicker.hxx b/fpicker/source/win32/folderpicker/FolderPicker.hxx index aa36dc6995ca..619ded48f5d9 100644 --- a/fpicker/source/win32/folderpicker/FolderPicker.hxx +++ b/fpicker/source/win32/folderpicker/FolderPicker.hxx @@ -30,9 +30,9 @@ #include "WinFOPImpl.hxx" -//---------------------------------------------------------- + // class declaration -//---------------------------------------------------------- + class CFolderPicker : public cppu::WeakImplHelper2< @@ -44,9 +44,9 @@ public: // ctor/dtor CFolderPicker( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceMgr ); - //------------------------------------------------------------------------------------ + // XExecutableDialog - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setTitle( const OUString& aTitle ) throw( com::sun::star::uno::RuntimeException ); @@ -54,9 +54,9 @@ public: virtual sal_Int16 SAL_CALL execute( ) throw( com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------------------ + // XFolderPicker functions - //------------------------------------------------------------------------------------ + virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); @@ -70,9 +70,9 @@ public: virtual void SAL_CALL setDescription( const OUString& aDescription ) throw( com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XServiceInfo - //------------------------------------------------ + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); @@ -83,17 +83,17 @@ public: virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // XCancellable - //------------------------------------------------ + virtual void SAL_CALL cancel( ) throw(::com::sun::star::uno::RuntimeException); - //------------------------------------------------ + // overwrite base class method, which is called // by base class dispose function - //------------------------------------------------ + virtual void SAL_CALL disposing(); diff --git a/fpicker/source/win32/folderpicker/MtaFop.cxx b/fpicker/source/win32/folderpicker/MtaFop.cxx index 4ceee8c661a3..cbab83b6e750 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.cxx +++ b/fpicker/source/win32/folderpicker/MtaFop.cxx @@ -113,7 +113,7 @@ CMtaFolderPicker::CMtaFolderPicker( sal_uInt32 Flags ) : ZeroMemory( &m_bi, sizeof( m_bi ) ); // !!!!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!!!!!!! - // + // Remember: This HACK prevents you from stepping // through your code in the debugger because if you // set a break point in the ctor here the debugger @@ -226,7 +226,7 @@ CMtaFolderPicker::~CMtaFolderPicker( ) } -// + sal_Bool CMtaFolderPicker::browseForFolder( ) @@ -310,7 +310,7 @@ sal_Bool CMtaFolderPicker::browseForFolder( ) } -// + void SAL_CALL CMtaFolderPicker::setDisplayDirectory( const OUString& aDirectory ) @@ -319,7 +319,7 @@ void SAL_CALL CMtaFolderPicker::setDisplayDirectory( const OUString& aDirectory } -// + OUString SAL_CALL CMtaFolderPicker::getDisplayDirectory( ) @@ -328,7 +328,7 @@ OUString SAL_CALL CMtaFolderPicker::getDisplayDirectory( ) } -// + OUString SAL_CALL CMtaFolderPicker::getDirectory( ) @@ -337,7 +337,7 @@ OUString SAL_CALL CMtaFolderPicker::getDirectory( ) } -// + void SAL_CALL CMtaFolderPicker::setDescription( const OUString& aDescription ) @@ -346,7 +346,7 @@ void SAL_CALL CMtaFolderPicker::setDescription( const OUString& aDescription ) } -// + void SAL_CALL CMtaFolderPicker::setTitle( const OUString& aTitle ) @@ -355,7 +355,7 @@ void SAL_CALL CMtaFolderPicker::setTitle( const OUString& aTitle ) } -// + OUString SAL_CALL CMtaFolderPicker::getTitle( ) @@ -382,7 +382,7 @@ void SAL_CALL CMtaFolderPicker::cancel( ) } -// + sal_Bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( ) @@ -410,7 +410,7 @@ sal_Bool SAL_CALL CMtaFolderPicker::onBrowseForFolder( ) } -// + void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList ) @@ -425,7 +425,7 @@ void SAL_CALL CMtaFolderPicker::releaseItemIdList( LPITEMIDLIST lpItemIdList ) } -// + LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& aDirectory ) @@ -454,7 +454,7 @@ LPITEMIDLIST SAL_CALL CMtaFolderPicker::getItemIdListFromPath( const OUString& a } -// + OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemIdList ) @@ -472,7 +472,7 @@ OUString SAL_CALL CMtaFolderPicker::getPathFromItemIdList( LPCITEMIDLIST lpItemI } -// + void SAL_CALL CMtaFolderPicker::enableOk( sal_Bool bEnable ) @@ -487,7 +487,7 @@ void SAL_CALL CMtaFolderPicker::enableOk( sal_Bool bEnable ) } -// + void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory ) @@ -502,7 +502,7 @@ void SAL_CALL CMtaFolderPicker::setSelection( const OUString& aDirectory ) } -// + void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText ) @@ -517,7 +517,7 @@ void SAL_CALL CMtaFolderPicker::setStatusText( const OUString& aStatusText ) } -// + void SAL_CALL CMtaFolderPicker::onInitialized( ) @@ -537,7 +537,7 @@ void SAL_CALL CMtaFolderPicker::onInitialized( ) } -// + sal_uInt32 CMtaFolderPicker::onValidateFailed() @@ -547,7 +547,7 @@ sal_uInt32 CMtaFolderPicker::onValidateFailed() } -// + int CALLBACK CMtaFolderPicker::FolderPickerCallback( HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData ) @@ -658,7 +658,7 @@ LRESULT CALLBACK CMtaFolderPicker::StaWndProc( HWND hWnd, UINT uMsg, WPARAM wPar } -// + sal_Bool SAL_CALL CMtaFolderPicker::createStaRequestWindow( ) @@ -689,7 +689,7 @@ sal_Bool SAL_CALL CMtaFolderPicker::createStaRequestWindow( ) } -// + unsigned int CMtaFolderPicker::run( ) @@ -733,7 +733,7 @@ unsigned int CMtaFolderPicker::run( ) } -// + unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam ) @@ -754,7 +754,7 @@ unsigned int WINAPI CMtaFolderPicker::StaThreadProc( LPVOID pParam ) } -// + ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( ) @@ -794,7 +794,7 @@ ATOM SAL_CALL CMtaFolderPicker::RegisterStaRequestWindowClass( ) } -// + void SAL_CALL CMtaFolderPicker::UnregisterStaRequestWindowClass( ) diff --git a/fpicker/source/win32/folderpicker/MtaFop.hxx b/fpicker/source/win32/folderpicker/MtaFop.hxx index 6824d41420a5..35076bda8388 100644 --- a/fpicker/source/win32/folderpicker/MtaFop.hxx +++ b/fpicker/source/win32/folderpicker/MtaFop.hxx @@ -39,10 +39,10 @@ #endif #include "../misc/WinImplHelper.hxx" -//---------------------------------------------------------------- + // a simple helper class used to provide a buffer for different // Win32 file and directory functions -//---------------------------------------------------------------- + class CAutoPathBuff { @@ -80,14 +80,14 @@ private: sal_Unicode* pBuff; }; -//-------------------------------------------------------- + // the Mta-Ole clipboard class is for internal use only! // only one instance of this class should be created, the // user has to ensure this! // the class is not thread-safe because it will be used // only from within the clipboard service and the methods // of the clipboard service are already synchronized -//-------------------------------------------------------- + class CMtaFolderPicker { @@ -107,9 +107,9 @@ public: virtual void SAL_CALL setTitle( const OUString& aTitle ); OUString SAL_CALL getTitle( ); - //----------------------------------------------------- + // XCancellable - //----------------------------------------------------- + virtual void SAL_CALL cancel( ); @@ -135,10 +135,10 @@ private: // target; so we guarantee synchronization sal_Bool SAL_CALL createStaRequestWindow( ); - //--------------------------------------------------------------- + // message handler functions; remember these functions are called // from a different thread context! - //--------------------------------------------------------------- + sal_Bool SAL_CALL onBrowseForFolder( ); diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx index 578cd1de09d8..7140e63fa1e3 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.cxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.cxx @@ -38,7 +38,7 @@ using namespace com::sun::star::ui::dialogs; using osl::FileBase; -// + const OUString BACKSLASH( "\\" ); @@ -113,7 +113,7 @@ OUString CWinFolderPickerImpl::getDisplayDirectory( ) } -// + OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException ) @@ -128,7 +128,7 @@ OUString SAL_CALL CWinFolderPickerImpl::getDirectory( ) throw( RuntimeException } -// + sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) throw( RuntimeException ) @@ -139,7 +139,7 @@ sal_Int16 SAL_CALL CWinFolderPickerImpl::execute( ) throw( RuntimeException ) } -// + void CWinFolderPickerImpl::onSelChanged( const OUString& aNewPath ) diff --git a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx index 1c87dfc59325..b464d15874ef 100644 --- a/fpicker/source/win32/folderpicker/WinFOPImpl.hxx +++ b/fpicker/source/win32/folderpicker/WinFOPImpl.hxx @@ -24,9 +24,9 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include "MtaFop.hxx" -//------------------------------------------------------------------------ + // forward -//------------------------------------------------------------------------ + class CFolderPicker; @@ -35,16 +35,16 @@ class CWinFolderPickerImpl : public CMtaFolderPicker public: CWinFolderPickerImpl( CFolderPicker* aFolderPicker ); - //----------------------------------------------------------------------------------------- + // XExecutableDialog - //----------------------------------------------------------------------------------------- + virtual sal_Int16 SAL_CALL execute( ) throw( com::sun::star::uno::RuntimeException ); - //----------------------------------------------------- + // XFolderPicker - //----------------------------------------------------- + virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException ); diff --git a/fpicker/source/win32/misc/WinImplHelper.cxx b/fpicker/source/win32/misc/WinImplHelper.cxx index a00f8ff17ce4..bc42e736328d 100644 --- a/fpicker/source/win32/misc/WinImplHelper.cxx +++ b/fpicker/source/win32/misc/WinImplHelper.cxx @@ -35,7 +35,7 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; -// + const OUString TILDE( "~" ); @@ -45,7 +45,7 @@ const sal_Unicode AMPERSAND_SIGN = L'&'; // OS NAME Platform Major Minor -// + // Windows NT 3.51 VER_PLATFORM_WIN32_NT 3 51 // Windows NT 4.0 VER_PLATFORM_WIN32_NT 4 0 // Windows 2000 VER_PLATFORM_WIN32_NT 5 0 @@ -80,7 +80,7 @@ bool SAL_CALL IsWindowsVistaOrNewer() } -// + void SAL_CALL ListboxAddString( HWND hwnd, const OUString& aString ) @@ -92,7 +92,7 @@ void SAL_CALL ListboxAddString( HWND hwnd, const OUString& aString ) } -// + OUString SAL_CALL ListboxGetString( HWND hwnd, sal_Int32 aPosition ) @@ -127,7 +127,7 @@ OUString SAL_CALL ListboxGetString( HWND hwnd, sal_Int32 aPosition ) } -// + void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) @@ -149,7 +149,7 @@ void SAL_CALL ListboxAddItem( HWND hwnd, const Any& aItem, const Reference< XInt } -// + void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) @@ -175,7 +175,7 @@ void SAL_CALL ListboxAddItems( HWND hwnd, const Any& aItemList, const Reference< } -// + void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) @@ -207,7 +207,7 @@ void SAL_CALL ListboxDeleteItem( HWND hwnd, const Any& aPosition, const Referenc } -// + void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInterface >&, sal_Int16 ) @@ -227,7 +227,7 @@ void SAL_CALL ListboxDeleteItems( HWND hwnd, const Any&, const Reference< XInter } -// + void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Reference< XInterface >& rXInterface, sal_Int16 aArgPos ) @@ -263,7 +263,7 @@ void SAL_CALL ListboxSetSelectedItem( HWND hwnd, const Any& aPosition, const Ref } -// + Any SAL_CALL ListboxGetItems( HWND hwnd ) @@ -291,7 +291,7 @@ Any SAL_CALL ListboxGetItems( HWND hwnd ) } -// + Any SAL_CALL ListboxGetSelectedItem( HWND hwnd ) @@ -307,7 +307,7 @@ Any SAL_CALL ListboxGetSelectedItem( HWND hwnd ) } -// + Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd ) @@ -323,7 +323,7 @@ Any SAL_CALL ListboxGetSelectedItemIndex( HWND hwnd ) } -// + Any SAL_CALL CheckboxGetState( HWND hwnd ) @@ -338,7 +338,7 @@ Any SAL_CALL CheckboxGetState( HWND hwnd ) } -// + void SAL_CALL CheckboxSetState( @@ -360,7 +360,7 @@ void SAL_CALL CheckboxSetState( } -// + sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr ) @@ -380,7 +380,7 @@ sal_uInt32 SAL_CALL _wcslenex( const sal_Unicode* pStr ) } -// + void Replace( const OUString& aLabel, sal_Unicode OldChar, sal_Unicode NewChar, OUStringBuffer& aBuffer ) diff --git a/fpicker/source/win32/misc/resourceprovider.cxx b/fpicker/source/win32/misc/resourceprovider.cxx index e5063b5d2e38..2c00fc2244dc 100644 --- a/fpicker/source/win32/misc/resourceprovider.cxx +++ b/fpicker/source/win32/misc/resourceprovider.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds; using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds; -// + #define FOLDERPICKER_TITLE 500 @@ -72,7 +72,7 @@ _Entry CtrlIdToResIdTable[] = { const sal_Int32 SIZE_TABLE = SAL_N_ELEMENTS( CtrlIdToResIdTable ); -// + sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) @@ -92,7 +92,7 @@ sal_Int16 CtrlIdToResId( sal_Int32 aControlId ) } -// + class CResourceProvider_Impl @@ -100,7 +100,7 @@ class CResourceProvider_Impl public: - // + CResourceProvider_Impl( ) @@ -111,7 +111,7 @@ public: } - // + ~CResourceProvider_Impl( ) @@ -120,7 +120,7 @@ public: } - // + OUString getResString( sal_Int16 aId ) @@ -149,7 +149,7 @@ public: }; -// + CResourceProvider::CResourceProvider( ) : @@ -158,7 +158,7 @@ CResourceProvider::CResourceProvider( ) : } -// + CResourceProvider::~CResourceProvider( ) @@ -167,7 +167,7 @@ CResourceProvider::~CResourceProvider( ) } -// + OUString CResourceProvider::getResString( sal_Int16 aId ) |