[Libreoffice-commits] core.git: fpicker/source
Alexander Wilms
f.alexander.wilms at gmail.com
Wed Feb 26 02:35:51 PST 2014
fpicker/source/aqua/ControlHelper.hxx | 32 +-
fpicker/source/aqua/ControlHelper.mm | 16 -
fpicker/source/aqua/FilterHelper.mm | 20 -
fpicker/source/aqua/SalAquaFilePicker.hxx | 56 ++---
fpicker/source/aqua/SalAquaFilePicker.mm | 60 ++---
fpicker/source/aqua/SalAquaFolderPicker.hxx | 24 +-
fpicker/source/aqua/SalAquaFolderPicker.mm | 32 +-
fpicker/source/aqua/SalAquaPicker.hxx | 4
fpicker/source/aqua/SalAquaPicker.mm | 4
fpicker/source/aqua/resourceprovider.mm | 62 ++---
fpicker/source/office/OfficeControlAccess.cxx | 26 +-
fpicker/source/office/OfficeControlAccess.hxx | 12 -
fpicker/source/office/OfficeFilePicker.cxx | 10
fpicker/source/office/OfficeFilePicker.hxx | 56 ++---
fpicker/source/office/OfficeFolderPicker.hxx | 20 -
fpicker/source/office/asyncfilepicker.cxx | 12 -
fpicker/source/office/asyncfilepicker.hxx | 12 -
fpicker/source/office/commonpicker.cxx | 10
fpicker/source/office/commonpicker.hxx | 52 ++--
fpicker/source/office/fpinteraction.cxx | 12 -
fpicker/source/office/fpinteraction.hxx | 12 -
fpicker/source/office/fpsmartcontent.cxx | 12 -
fpicker/source/office/fpsmartcontent.hxx | 12 -
fpicker/source/office/iodlg.cxx | 112 +++++-----
fpicker/source/office/iodlg.hrc | 4
fpicker/source/office/iodlg.hxx | 36 +--
fpicker/source/office/iodlgimp.cxx | 32 +-
fpicker/source/office/iodlgimp.hxx | 8
fpicker/source/office/pickercallbacks.hxx | 12 -
fpicker/source/win32/filepicker/FPentry.cxx | 2
fpicker/source/win32/filepicker/FileOpenDlg.cxx | 72 +++---
fpicker/source/win32/filepicker/FileOpenDlg.hxx | 4
fpicker/source/win32/filepicker/FilePicker.cxx | 68 +++---
fpicker/source/win32/filepicker/FilePicker.hxx | 64 ++---
fpicker/source/win32/filepicker/FilterContainer.cxx | 8
fpicker/source/win32/filepicker/FilterContainer.hxx | 8
fpicker/source/win32/filepicker/Fps.rc | 46 ++--
fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx | 6
fpicker/source/win32/filepicker/PreviewCtrl.cxx | 18 -
fpicker/source/win32/filepicker/PreviewCtrl.hxx | 12 -
fpicker/source/win32/filepicker/VistaFilePicker.cxx | 26 +-
fpicker/source/win32/filepicker/VistaFilePicker.hxx | 70 +++---
fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx | 46 ++--
fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx | 88 +++----
fpicker/source/win32/filepicker/WinFileOpenImpl.cxx | 58 ++---
fpicker/source/win32/filepicker/WinFileOpenImpl.hxx | 32 +-
fpicker/source/win32/filepicker/asynceventnotifier.cxx | 32 +-
fpicker/source/win32/filepicker/asynceventnotifier.hxx | 6
fpicker/source/win32/filepicker/asyncrequests.hxx | 50 ++--
fpicker/source/win32/filepicker/comptr.hxx | 40 +--
fpicker/source/win32/filepicker/controlaccess.cxx | 16 -
fpicker/source/win32/filepicker/controlcommand.cxx | 34 +--
fpicker/source/win32/filepicker/controlcommand.hxx | 30 +-
fpicker/source/win32/filepicker/controlcommandrequest.hxx | 10
fpicker/source/win32/filepicker/controlcommandresult.hxx | 16 -
fpicker/source/win32/filepicker/customcontrol.cxx | 8
fpicker/source/win32/filepicker/customcontrol.hxx | 6
fpicker/source/win32/filepicker/customcontrolcontainer.cxx | 14 -
fpicker/source/win32/filepicker/customcontrolcontainer.hxx | 4
fpicker/source/win32/filepicker/customcontrolfactory.cxx | 4
fpicker/source/win32/filepicker/customcontrolfactory.hxx | 10
fpicker/source/win32/filepicker/dialogcustomcontrols.cxx | 20 -
fpicker/source/win32/filepicker/dialogcustomcontrols.hxx | 38 +--
fpicker/source/win32/filepicker/dibpreview.cxx | 30 +-
fpicker/source/win32/filepicker/dibpreview.hxx | 4
fpicker/source/win32/filepicker/eventnotification.hxx | 4
fpicker/source/win32/filepicker/filepickereventnotification.cxx | 4
fpicker/source/win32/filepicker/filepickereventnotification.hxx | 8
fpicker/source/win32/filepicker/filepickerstate.cxx | 56 ++---
fpicker/source/win32/filepicker/filepickerstate.hxx | 18 -
fpicker/source/win32/filepicker/getfilenamewrapper.cxx | 12 -
fpicker/source/win32/filepicker/helppopupwindow.cxx | 30 +-
fpicker/source/win32/filepicker/helppopupwindow.hxx | 4
fpicker/source/win32/filepicker/previewadapter.cxx | 72 +++---
fpicker/source/win32/filepicker/previewadapter.hxx | 8
fpicker/source/win32/filepicker/previewbase.cxx | 22 -
fpicker/source/win32/filepicker/previewbase.hxx | 4
fpicker/source/win32/filepicker/resource.h | 4
fpicker/source/win32/filepicker/vistatypes.h | 4
fpicker/source/win32/filepicker/workbench/Test_fps.cxx | 4
fpicker/source/win32/folderpicker/FolderPicker.cxx | 14 -
fpicker/source/win32/folderpicker/FolderPicker.hxx | 24 +-
fpicker/source/win32/folderpicker/MtaFop.cxx | 46 ++--
fpicker/source/win32/folderpicker/MtaFop.hxx | 16 -
fpicker/source/win32/folderpicker/WinFOPImpl.cxx | 8
fpicker/source/win32/folderpicker/WinFOPImpl.hxx | 12 -
fpicker/source/win32/misc/WinImplHelper.cxx | 32 +-
fpicker/source/win32/misc/resourceprovider.cxx | 18 -
88 files changed, 1098 insertions(+), 1098 deletions(-)
New commits:
commit 2a09751d51332aa413e769d0f7916aca0cf4e742
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 18:51:57 2014 +0100
Remove visual noise from fpicker
Change-Id: I58ae70cc71853e17e638ef64aaded87615e37986
Reviewed-on: https://gerrit.libreoffice.org/8264
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/fpicker/source/aqua/ControlHelper.hxx b/fpicker/source/aqua/ControlHelper.hxx
index 4619f98..b00aad9 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 c627d9b..025639a 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 3371730..4132783 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 d0bda1f..a986176 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 bc244b9..0d62482 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 1849fee..699291d 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 1b147d1..31cd0e1 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 ca53214..dff3fed 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 5b155fa..664088f 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 32b5772..d80f2f6 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 d7518de..90f23d6 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 ac472e7..c5b03d4 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 5c6bbfa..6361f50 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 88ea346..2f357d8 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 3a58209..a33bb58 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 d276325..d4c5241 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 f595c0b..1b19e8a 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 3602918..356c879 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 5008f68..576f377 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 6072f11..c4cd1db 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 d8bdc19..a74305c 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 e12a4a9..33a8f99 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 07c5d03..658f503 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 2a64385..e850f7d 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 73e7901..b16bc8eb 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 41ffff3..45b8544 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 e8630a1..2bc796a 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 0193db3..2578e9b 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 e8c19f5..1981b7c 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 d0ae05d..beb57a7 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 0898bfe..46334643c 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 ca40576..de3f79e 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 105bb81..2d91c33 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)
}
-//
+
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list