diff options
Diffstat (limited to 'extensions/source')
-rw-r--r-- | extensions/source/abpilot/moduleabp.cxx | 1 | ||||
-rw-r--r-- | extensions/source/dbpilots/dbpservices.hxx | 1 | ||||
-rw-r--r-- | extensions/source/dbpilots/moduledbp.cxx | 1 | ||||
-rw-r--r-- | extensions/source/ole/ole2uno.hxx | 5 | ||||
-rw-r--r-- | extensions/source/propctrlr/pcrservices.hxx | 1 | ||||
-rw-r--r-- | extensions/source/scanner/grid.hxx | 4 | ||||
-rw-r--r-- | extensions/source/scanner/scanwin.cxx | 8 |
7 files changed, 7 insertions, 14 deletions
diff --git a/extensions/source/abpilot/moduleabp.cxx b/extensions/source/abpilot/moduleabp.cxx index ce028b6d8d18..0a8f8fd4d291 100644 --- a/extensions/source/abpilot/moduleabp.cxx +++ b/extensions/source/abpilot/moduleabp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <componentmodule.cxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/dbpilots/dbpservices.hxx b/extensions/source/dbpilots/dbpservices.hxx index 655c818501c7..2d135df17287 100644 --- a/extensions/source/dbpilots/dbpservices.hxx +++ b/extensions/source/dbpilots/dbpservices.hxx @@ -29,7 +29,6 @@ extern "C" { void createRegistryInfo_OGridWizard(); void createRegistryInfo_OGroupBoxWizard(); void createRegistryInfo_OListComboWizard(); - } #endif diff --git a/extensions/source/dbpilots/moduledbp.cxx b/extensions/source/dbpilots/moduledbp.cxx index ce028b6d8d18..0a8f8fd4d291 100644 --- a/extensions/source/dbpilots/moduledbp.cxx +++ b/extensions/source/dbpilots/moduledbp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <componentmodule.cxx> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx index 99a3e7ae17e4..04e2823a7bc3 100644 --- a/extensions/source/ole/ole2uno.hxx +++ b/extensions/source/ole/ole2uno.hxx @@ -48,13 +48,13 @@ using namespace com::sun::star::beans; using namespace osl; using namespace std; -VARTYPE getVarType( const Any& val); +VARTYPE getVarType(const Any& val); /* creates a Type object for a given type name. The function returns false if the name does not represent a valid type. */ -bool getType( BSTR name, Type & type); +bool getType(BSTR name, Type& type); void o2u_attachCurrentThread(); class BridgeRuntimeError @@ -67,7 +67,6 @@ public: OUString message; }; - Mutex* getBridgeMutex(); #endif // INCLUDED_EXTENSIONS_SOURCE_OLE_OLE2UNO_HXX diff --git a/extensions/source/propctrlr/pcrservices.hxx b/extensions/source/propctrlr/pcrservices.hxx index 73cd86b9487b..f6649cc39d09 100644 --- a/extensions/source/propctrlr/pcrservices.hxx +++ b/extensions/source/propctrlr/pcrservices.hxx @@ -45,7 +45,6 @@ void createRegistryInfo_ObjectInspectorModel(); void createRegistryInfo_StringRepresentation(); void createRegistryInfo_SubmissionPropertyHandler(); void createRegistryInfo_XSDValidationPropertyHandler(); - } #endif diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index 1f3a0f191cca..86f1a521c6e1 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.hxx @@ -36,10 +36,10 @@ class GridDialog : public weld::GenericDialogController std::unique_ptr<weld::Button> m_xOKButton; std::unique_ptr<weld::ComboBox> m_xResetTypeBox; std::unique_ptr<weld::Button> m_xResetButton; - std::unique_ptr<GridWindow> m_xGridWindow; + std::unique_ptr<GridWindow> m_xGridWindow; std::unique_ptr<weld::CustomWeld> m_xGridWindowWND; - DECL_LINK( ClickButtonHdl, weld::Button&, void ); + DECL_LINK(ClickButtonHdl, weld::Button&, void); public: GridDialog(weld::Window* pParent, double* pXValues, double* pYValues, int nValues); diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index c8a66b73ade8..131cf5f50a1b 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -43,7 +43,6 @@ namespace { - enum TwainState { TWAIN_STATE_NONE = 0, @@ -342,8 +341,7 @@ bool Twain::InitializeNewShim(ScannerManager& rMgr, const VclPtr<vcl::Window>& x return false; // Have a shim for another task already! // hold reference to ScannerManager, to prevent premature death - mxMgr.set(static_cast<OWeakObject*>(mpCurMgr = &rMgr), - css::uno::UNO_QUERY); + mxMgr.set(static_cast<OWeakObject*>(mpCurMgr = &rMgr), css::uno::UNO_QUERY); mpThread.set(new ShimListenerThread(xTopWindow)); mpThread->launch(); @@ -595,8 +593,8 @@ sal_Bool SAL_CALL ScannerManager::configureScannerAndScan( VclPtr<vcl::Window> xTopWindow = ImplGetActiveFrameWindow(); if (xTopWindow) - xTopWindow->IncModalCount(); // to avoid changes between the two operations that each - // block the window + xTopWindow + ->IncModalCount(); // to avoid changes between the two operations that each block the window comphelper::ScopeGuard aModalGuard([xTopWindow]() { if (xTopWindow) xTopWindow->DecModalCount(); |