summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-09 08:35:35 +0200
committerNoel Grandin <noel@peralex.com>2015-11-09 08:36:01 +0200
commit4671c3e2944678fa1f3875b13839391d8df49578 (patch)
tree99684e9f0aeb23f93b405c1238f116a347462cc0 /sw/source/uibase/inc
parentf045b7cb457e8ca1c0a2b3d3ec08f5fe647542bd (diff)
formatting improvements in sw/
after my recent "com::sun::star->css in sw" commit Change-Id: I2545648fc6f14ea0ebcabbe012e91546cf392b16
Diffstat (limited to 'sw/source/uibase/inc')
-rw-r--r--sw/source/uibase/inc/SwXFilterOptions.hxx6
-rw-r--r--sw/source/uibase/inc/hyp.hxx10
-rw-r--r--sw/source/uibase/inc/mailmrge.hxx2
-rw-r--r--sw/source/uibase/inc/mmconfigitem.hxx1
-rw-r--r--sw/source/uibase/inc/olmenu.hxx9
-rw-r--r--sw/source/uibase/inc/unodispatch.hxx2
-rw-r--r--sw/source/uibase/inc/unotxvw.hxx6
-rw-r--r--sw/source/uibase/inc/workctrl.hxx4
8 files changed, 15 insertions, 25 deletions
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx
index b76ecf5078b6..0e206e8c6cc4 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -41,10 +41,8 @@ class SwXFilterOptions : public ::cppu::WeakImplHelper<
OUString sFilterName;
OUString sFilterOptions;
- css::uno::Reference<
- css::io::XInputStream > xInputStream;
- css::uno::Reference<
- css::lang::XComponent > xModel;
+ css::uno::Reference< css::io::XInputStream > xInputStream;
+ css::uno::Reference< css::lang::XComponent > xModel;
bool bExport;
public:
diff --git a/sw/source/uibase/inc/hyp.hxx b/sw/source/uibase/inc/hyp.hxx
index 8031e2203137..258c39693237 100644
--- a/sw/source/uibase/inc/hyp.hxx
+++ b/sw/source/uibase/inc/hyp.hxx
@@ -29,10 +29,9 @@ class SwView;
class SwHyphWrapper : public SvxSpellWrapper {
private:
SwView* pView;
- css::uno::Reference<
- css::linguistic2::XHyphenator > xHyph;
- sal_uInt16 nPageCount; // page count for progress view
- sal_uInt16 nPageStart; // 1st checked page
+ css::uno::Reference< css::linguistic2::XHyphenator > xHyph;
+ sal_uInt16 nPageCount; // page count for progress view
+ sal_uInt16 nPageStart; // 1st checked page
bool bInSelection : 1; // separating selected text
bool bAutomatic : 1; // insert separators without further inquiry
bool bInfoBox : 1; // display info-box when ending
@@ -46,8 +45,7 @@ protected:
public:
SwHyphWrapper( SwView* pVw,
- css::uno::Reference<
- css::linguistic2::XHyphenator > &rxHyph,
+ css::uno::Reference< css::linguistic2::XHyphenator > &rxHyph,
bool bStart, bool bOther, bool bSelect );
virtual ~SwHyphWrapper();
};
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index 9132a282ca26..b0ab3ba771e0 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -98,7 +98,7 @@ class SwMailMergeDlg : public SvxStandardDialog
SwModuleOptions* pModOpt;
DBManagerOptions nMergeType;
- css::uno::Sequence< css::uno::Any > m_aSelection;
+ css::uno::Sequence< css::uno::Any > m_aSelection;
css::uno::Reference< css::frame::XFrame2 > m_xFrame;
Size m_aDialogSize;
diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx
index 4eb41f011511..7637bfb3712c 100644
--- a/sw/source/uibase/inc/mmconfigitem.hxx
+++ b/sw/source/uibase/inc/mmconfigitem.hxx
@@ -49,7 +49,6 @@ struct SwDocMergeInfo
class SW_DLLPUBLIC SwMailMergeConfigItem
{
-// css::uno::Sequence< OUString> m_aSavedDocuments;
SwMailMergeConfigItem_Impl* m_pImpl;
//session information - not stored in configuration
bool m_bAddressInserted;
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx
index 3e1324bb1bea..1aab51e8b3f0 100644
--- a/sw/source/uibase/inc/olmenu.hxx
+++ b/sw/source/uibase/inc/olmenu.hxx
@@ -36,10 +36,8 @@ class SwWrtShell;
class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
{
SwWrtShell* m_pSh;
- css::uno::Sequence< css::uno::Reference<
- css::linguistic2::XDictionary > > m_aDics;
- css::uno::Reference<
- css::linguistic2::XSpellAlternatives > m_xSpellAlt;
+ css::uno::Sequence< css::uno::Reference< css::linguistic2::XDictionary > > m_aDics;
+ css::uno::Reference< css::linguistic2::XSpellAlternatives > m_xSpellAlt;
css::linguistic2::ProofreadingResult m_xGrammarResult;
sal_Int32 m_nGrammarError;
@@ -71,8 +69,7 @@ class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
public:
SwSpellPopup( SwWrtShell *pWrtSh,
- const css::uno::Reference<
- css::linguistic2::XSpellAlternatives > &xAlt,
+ const css::uno::Reference< css::linguistic2::XSpellAlternatives > &xAlt,
const OUString & rParaText );
SwSpellPopup( SwWrtShell *pWrtSh,
diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index 2889116c0200..b115f7e49744 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -90,7 +90,7 @@ public:
struct StatusStruct_Impl
{
css::uno::Reference< css::frame::XStatusListener> xListener;
- css::util::URL aURL;
+ css::util::URL aURL;
};
typedef std::list< StatusStruct_Impl > StatusListenerList;
class SwXDispatch : public cppu::WeakImplHelper
diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx
index e6d9b4b51e04..f94a55f31482 100644
--- a/sw/source/uibase/inc/unotxvw.hxx
+++ b/sw/source/uibase/inc/unotxvw.hxx
@@ -111,15 +111,13 @@ public:
//XRubySelection
virtual css::uno::Sequence<
- css::uno::Sequence<
- css::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic )
+ css::uno::Sequence< css::beans::PropertyValue > > SAL_CALL getRubyList( sal_Bool bAutomatic )
throw (css::uno::RuntimeException,
std::exception) override;
virtual void SAL_CALL setRubyList(
const css::uno::Sequence<
- css::uno::Sequence<
- css::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic )
+ css::uno::Sequence< css::beans::PropertyValue > >& RubyList, sal_Bool bAutomatic )
throw (css::uno::RuntimeException,
std::exception) override;
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index b2e220eabf26..233168288c27 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -121,8 +121,8 @@ protected:
virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
public:
- SwScrollNaviPopup( sal_uInt16 nId, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window *pParent );
- virtual ~SwScrollNaviPopup();
+ SwScrollNaviPopup( sal_uInt16 nId, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window *pParent );
+ virtual ~SwScrollNaviPopup();
virtual void dispose() override;
static OUString GetQuickHelpText(bool bNext);