diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 22:51:59 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 04:56:16 -0600 |
commit | d9f0af83b7f0abe7119eefca62cbbca7eff818ef (patch) | |
tree | 19b6ed4d3b1dd538bb46205880505e59f8bb8002 /vcl/osx | |
parent | 0fb3bdc5d3aa47a61affc67b20bdbb775808fb66 (diff) |
Remove visual noise from vcl
Conflicts:
vcl/source/app/settings.cxx
vcl/source/window/dockmgr.cxx
vcl/source/window/dockwin.cxx
vcl/source/window/floatwin.cxx
vcl/source/window/toolbox2.cxx
Change-Id: Ie67681549a76e77064b09d4b5bf80fe4c6010341
Reviewed-on: https://gerrit.libreoffice.org/8339
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/osx')
-rw-r--r-- | vcl/osx/DataFlavorMapping.cxx | 14 | ||||
-rw-r--r-- | vcl/osx/DataFlavorMapping.hxx | 2 | ||||
-rw-r--r-- | vcl/osx/HtmlFmtFlt.cxx | 4 | ||||
-rw-r--r-- | vcl/osx/OSXTransferable.hxx | 8 | ||||
-rw-r--r-- | vcl/osx/clipboard.hxx | 20 | ||||
-rw-r--r-- | vcl/osx/documentfocuslistener.hxx | 4 | ||||
-rw-r--r-- | vcl/osx/salframe.cxx | 4 | ||||
-rw-r--r-- | vcl/osx/salinst.cxx | 6 | ||||
-rw-r--r-- | vcl/osx/salmenu.cxx | 8 | ||||
-rw-r--r-- | vcl/osx/salobj.cxx | 2 | ||||
-rw-r--r-- | vcl/osx/salprn.cxx | 4 | ||||
-rw-r--r-- | vcl/osx/salsys.cxx | 2 | ||||
-rw-r--r-- | vcl/osx/saltimer.cxx | 2 |
13 files changed, 40 insertions, 40 deletions
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx index b24dffcb8411..25ec32e60a37 100644 --- a/vcl/osx/DataFlavorMapping.cxx +++ b/vcl/osx/DataFlavorMapping.cxx @@ -147,7 +147,7 @@ namespace // private } // namespace private -//########################### + /* A base class for other data provider. */ @@ -185,7 +185,7 @@ DataProviderBaseImpl::~DataProviderBaseImpl() } } -//################################# + class UniDataProvider : public DataProviderBaseImpl { @@ -238,7 +238,7 @@ Any UniDataProvider::getOOoData() return oOOData; } -//########################### + class ByteSequenceDataProvider : public DataProviderBaseImpl { @@ -292,7 +292,7 @@ Any ByteSequenceDataProvider::getOOoData() } -//########################### + class HTMLFormatDataProvider : public DataProviderBaseImpl { @@ -357,7 +357,7 @@ Any HTMLFormatDataProvider::getOOoData() return oOOData; } -//########################### + class PNGDataProvider : public DataProviderBaseImpl { @@ -423,7 +423,7 @@ Any PNGDataProvider::getOOoData() return oOOData; } -//###################### + class FileListDataProvider : public DataProviderBaseImpl { @@ -487,7 +487,7 @@ Any FileListDataProvider::getOOoData() return oOOData; } -//########################### + DataFlavorMapper::DataFlavorMapper() { diff --git a/vcl/osx/DataFlavorMapping.hxx b/vcl/osx/DataFlavorMapping.hxx index a80bd41d6dda..b22813795e19 100644 --- a/vcl/osx/DataFlavorMapping.hxx +++ b/vcl/osx/DataFlavorMapping.hxx @@ -56,7 +56,7 @@ public: typedef std::auto_ptr<DataProvider> DataProviderPtr_t; -//################################ + class DataFlavorMapper diff --git a/vcl/osx/HtmlFmtFlt.cxx b/vcl/osx/HtmlFmtFlt.cxx index c45e7f856584..11ef00fdd6d6 100644 --- a/vcl/osx/HtmlFmtFlt.cxx +++ b/vcl/osx/HtmlFmtFlt.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star::uno; // converts the openoffice text/html clipboard format to the HTML Format // well known under MS Windows // the MS HTML Format has a header before the real html data -// + // Version:1.0 Version number of the clipboard. Staring is 0.9 // StartHTML: Byte count from the beginning of the clipboard to the start // of the context, or -1 if no context @@ -47,7 +47,7 @@ using namespace com::sun::star::uno; // start of the selection // EndSelection: Byte count from the beginning of the clipboard to the // end of the selection -// + // StartSelection and EndSelection are optional // The fragment should be preceded and followed by the HTML comments // <!--StartFragment--> and <!--EndFragment--> (no space between !-- and the diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx index 27885effd03f..cae40a2c7884 100644 --- a/vcl/osx/OSXTransferable.hxx +++ b/vcl/osx/OSXTransferable.hxx @@ -49,9 +49,9 @@ public: virtual ~OSXTransferable(); - //------------------------------------------------------------------------ + // XTransferable - //------------------------------------------------------------------------ + virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw( ::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException ); @@ -62,9 +62,9 @@ public: virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------ + // Helper functions not part of the XTransferable interface - //------------------------------------------------------------------------ + void initClipboardItemList(); diff --git a/vcl/osx/clipboard.hxx b/vcl/osx/clipboard.hxx index be63694863f8..596a287d5f22 100644 --- a/vcl/osx/clipboard.hxx +++ b/vcl/osx/clipboard.hxx @@ -86,9 +86,9 @@ public: ~AquaClipboard(); - //------------------------------------------------ + // XClipboard - //------------------------------------------------ + virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getContents() throw( ::com::sun::star::uno::RuntimeException ); @@ -100,16 +100,16 @@ public: virtual OUString SAL_CALL getName() throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XClipboardEx - //------------------------------------------------ + virtual sal_Int8 SAL_CALL getRenderingCapabilities() throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XClipboardNotifier - //------------------------------------------------ + virtual void SAL_CALL addClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) throw( ::com::sun::star::uno::RuntimeException ); @@ -117,15 +117,15 @@ public: virtual void SAL_CALL removeClipboardListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardListener >& listener ) throw( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XFlushableClipboard - //------------------------------------------------ + virtual void SAL_CALL flushClipboard( ) throw( com::sun::star::uno::RuntimeException ); - //------------------------------------------------ + // XServiceInfo - //------------------------------------------------ + virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException); diff --git a/vcl/osx/documentfocuslistener.hxx b/vcl/osx/documentfocuslistener.hxx index 1a604a677df5..834286683afe 100644 --- a/vcl/osx/documentfocuslistener.hxx +++ b/vcl/osx/documentfocuslistener.hxx @@ -28,9 +28,9 @@ #include <set> -// ------------------------- + // - DocumentFocusListener - -// ------------------------- + class DocumentFocusListener : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleEventListener > diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx index ab5ef79fb67e..f06ec700ea78 100644 --- a/vcl/osx/salframe.cxx +++ b/vcl/osx/salframe.cxx @@ -54,11 +54,11 @@ using namespace std; -// ======================================================================= + AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL; -// ======================================================================= + AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) : mpNSWindow(nil), diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index ecc85eebe259..a03346c02131 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -211,7 +211,7 @@ bool ImplSVMainHook( int * pnInit ) return TRUE; // indicate that ImplSVMainHook is implemented } -// ======================================================================= + void SalAbort( const OUString& rErrorText, bool bDumpCore ) { @@ -268,7 +268,7 @@ void InitSalMain() { } -// ======================================================================= + SalYieldMutex::SalYieldMutex() { @@ -333,7 +333,7 @@ void ImplSalYieldMutexRelease() pInst->mpSalYieldMutex->release(); } -// ======================================================================= + SalInstance* CreateSalInstance() { diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index b3a1736bd3ee..cf46277d9806 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -203,7 +203,7 @@ static void initAppMenu() } } -// ======================================================================= + SalMenu* AquaSalInstance::CreateMenu( sal_Bool bMenuBar, Menu* pVCLMenu ) { @@ -236,7 +236,7 @@ void AquaSalInstance::DestroyMenuItem( SalMenuItem* pSalMenuItem ) } -// ======================================================================= + /* @@ -524,7 +524,7 @@ void AquaSalMenu::removeFallbackMenuItem( NSMenuItem* pOldItem ) bool AquaSalMenu::VisibleMenuBar() { // Enable/disable experimental native menus code? - // + // To disable native menus, set the environment variable AQUA_NATIVE_MENUS to FALSE static const char *pExperimental = getenv ("AQUA_NATIVE_MENUS"); @@ -904,7 +904,7 @@ Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame ); } -// ======================================================================= + /* * SalMenuItem diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx index d749233e58a0..95bfe26491fa 100644 --- a/vcl/osx/salobj.cxx +++ b/vcl/osx/salobj.cxx @@ -24,7 +24,7 @@ #include "osx/salobj.h" #include "osx/salframe.h" -// ======================================================================= + AquaSalObject::AquaSalObject( AquaSalFrame* pFrame ) : mpFrame( pFrame ), diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index 8666988e2dd5..c4b032647b51 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -45,7 +45,7 @@ using namespace com::sun::star; using namespace com::sun::star::beans; -// ======================================================================= + AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) : mpGraphics( 0 ), @@ -608,7 +608,7 @@ sal_uLong AquaSalInfoPrinter::GetErrorCode() const return 0; } -// ======================================================================= + AquaSalPrinter::AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter ) : mpInfoPrinter( i_pInfoPrinter ) diff --git a/vcl/osx/salsys.cxx b/vcl/osx/salsys.cxx index e31044e1d61b..5fd29a8b9acb 100644 --- a/vcl/osx/salsys.cxx +++ b/vcl/osx/salsys.cxx @@ -30,7 +30,7 @@ #include "svids.hrc" -// ======================================================================= + AquaSalSystem::~AquaSalSystem() { diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx index df8396be2c19..15a960117c93 100644 --- a/vcl/osx/saltimer.cxx +++ b/vcl/osx/saltimer.cxx @@ -24,7 +24,7 @@ #include "osx/salframe.h" #include "osx/salinst.h" -// ======================================================================= + NSTimer* AquaSalTimer::pRunningTimer = nil; bool AquaSalTimer::bDispatchTimer = false; |