summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2015-05-15 13:27:19 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-05-15 17:55:15 +0000
commit5b1337f7b2e1f79d78d4bf6559bd84f1ebb934bf (patch)
tree82704da8367f25963d08c570a4fa57e30e4ca839 /cui
parent6fbda0905d4e721392038bfad9e173e180f788ee (diff)
tdf#62475: partial handmade fixes
Change-Id: Ib9af202c43b916b9af4b4e18db35d470a8692fe4 Reviewed-on: https://gerrit.libreoffice.org/15712 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx30
-rw-r--r--cui/source/inc/align.hxx2
-rw-r--r--cui/source/inc/dbregister.hxx12
-rw-r--r--cui/source/inc/hangulhanjadlg.hxx4
-rw-r--r--cui/source/options/connpoolconfig.cxx4
-rw-r--r--cui/source/options/connpoolconfig.hxx4
-rw-r--r--cui/source/options/connpooloptions.cxx4
-rw-r--r--cui/source/options/connpooloptions.hxx2
-rw-r--r--cui/source/options/connpoolsettings.cxx12
-rw-r--r--cui/source/options/connpoolsettings.hxx10
-rw-r--r--cui/source/options/dbregister.cxx2
-rw-r--r--cui/source/options/dbregisterednamesconfig.cxx6
-rw-r--r--cui/source/options/dbregisterednamesconfig.hxx6
-rw-r--r--cui/source/options/dbregistersettings.cxx6
-rw-r--r--cui/source/options/dbregistersettings.hxx5
-rw-r--r--cui/source/options/doclinkdialog.cxx6
-rw-r--r--cui/source/options/doclinkdialog.hxx6
-rw-r--r--cui/source/options/optHeaderTabListbox.cxx2
-rw-r--r--cui/source/options/sdbcdriverenum.cxx7
-rw-r--r--cui/source/options/sdbcdriverenum.hxx4
-rw-r--r--cui/source/options/securityoptions.cxx2
-rw-r--r--cui/source/options/securityoptions.hxx6
-rw-r--r--cui/source/options/webconninfo.cxx2
-rw-r--r--cui/source/options/webconninfo.hxx5
-rw-r--r--cui/source/tabpages/align.cxx2
-rw-r--r--cui/source/tabpages/borderconn.cxx2
-rw-r--r--cui/source/tabpages/borderconn.hxx2
27 files changed, 19 insertions, 136 deletions
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 49131f3049c7..839cb1f5d3b1 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -76,8 +76,6 @@ namespace svx
};
}
- //= PseudoRubyText
-
/** a class which allows to draw two texts in a pseudo-ruby way (which basically
means one text above or below the other, and a little bit smaller)
*/
@@ -209,8 +207,6 @@ namespace svx
*_pSecondaryLocation = aSecondaryRect;
}
- //= RubyRadioButton
-
class RubyRadioButton : public RadioButton
{
@@ -332,8 +328,6 @@ namespace svx
VCL_BUILDER_FACTORY_ARGS(RubyRadioButton, WB_LEFT|WB_VCENTER)
- //= SuggestionSet
-
SuggestionSet::SuggestionSet( vcl::Window* pParent )
: ValueSet( pParent, pParent->GetStyle() | WB_BORDER )
@@ -369,10 +363,6 @@ namespace svx
Clear();
}
-
- //= SuggestionDisplay
-
-
SuggestionDisplay::SuggestionDisplay( vcl::Window* pParent, WinBits nBits )
: Control( pParent, nBits )
, m_bDisplayListBox( true )
@@ -553,9 +543,6 @@ namespace svx
VCL_BUILDER_FACTORY_ARGS( SuggestionDisplay, WB_ITEMBORDER | WB_FLATVALUESET | WB_VSCROLL );
-
- //= HangulHanjaConversionDialog
-
HangulHanjaConversionDialog::HangulHanjaConversionDialog( vcl::Window* _pParent, HHC::ConversionDirection _ePrimaryDirection )
:ModalDialog( _pParent, "HangulHanjaConversionDialog", "cui/ui/hangulhanjaconversiondialog.ui" )
,m_pIgnoreNonPrimary( NULL )
@@ -946,11 +933,6 @@ namespace svx
}
-
- //= HangulHanjaOptionsDialog
-
-
-
void HangulHanjaOptionsDialog::Init()
{
if( !m_xConversionDictionaryList.is() )
@@ -1212,11 +1194,6 @@ namespace svx
pEntry->SetUserData( new OUString( _rName ) );
}
-
- //= HangulHanjaNewDictDialog
-
-
-
IMPL_LINK_NOARG(HangulHanjaNewDictDialog, OKHdl)
{
OUString aName(comphelper::string::stripEnd(m_pDictNameED->GetText(), ' '));
@@ -1269,11 +1246,6 @@ namespace svx
return m_bEntered;
}
-
- //= HangulHanjaEditDictDialog
-
-
-
class SuggestionList
{
private:
@@ -1885,7 +1857,7 @@ namespace svx
}
-} // namespace svx
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index b0f5e0aa7b5f..10ab45233440 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -113,7 +113,7 @@ private:
-} // namespace svx
+}
#endif
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 00c26d18c969..ea92b8c3dad7 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -35,10 +35,6 @@ namespace svx
namespace svx
{
-
-
- //= DbRegistrationOptionsPage
-
class DbRegistrationOptionsPage : public SfxTabPage
{
private:
@@ -100,9 +96,6 @@ namespace svx
virtual void FillUserData() SAL_OVERRIDE;
};
-
- //= RegistrationItemSetHolder
-
/** helper for DatabaseRegistrationDialog
Necessary so that DatabaseRegistrationDialog is self-contained, i.e. always reflects
@@ -121,9 +114,6 @@ namespace svx
const SfxItemSet& getRegistrationItems() const { return m_aRegistrationItems; }
};
-
- //= DatabaseRegistrationDialog
-
class DatabaseRegistrationDialog :public RegistrationItemSetHolder
,public SfxSingleTabDialog
{
@@ -134,7 +124,7 @@ namespace svx
};
-} // namespace svx
+}
#endif // INCLUDED_CUI_SOURCE_INC_DBREGISTER_HXX
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 3b88a7bd0b75..d758c7a3f8dc 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -99,8 +99,6 @@ namespace svx
class RubyRadioButton;
- //= HangulHanjaConversionDialog
-
class HangulHanjaConversionDialog : public ModalDialog
{
private:
@@ -326,7 +324,7 @@ namespace svx
};
-} // namespace svx
+}
#endif // SVX_HANGUL_HANJA_HXX
diff --git a/cui/source/options/connpoolconfig.cxx b/cui/source/options/connpoolconfig.cxx
index c7807bb0d1e1..fcc33c2971c4 100644
--- a/cui/source/options/connpoolconfig.cxx
+++ b/cui/source/options/connpoolconfig.cxx
@@ -72,10 +72,6 @@ namespace offapp
return OUString("Timeout");
}
-
- //= ConnectionPoolConfig
-
-
void ConnectionPoolConfig::GetOptions(SfxItemSet& _rFillItems)
{
// the config node where all pooling relevant info are stored under
diff --git a/cui/source/options/connpoolconfig.hxx b/cui/source/options/connpoolconfig.hxx
index fdaa129d223d..f43e135c35e9 100644
--- a/cui/source/options/connpoolconfig.hxx
+++ b/cui/source/options/connpoolconfig.hxx
@@ -25,10 +25,6 @@ class SfxItemSet;
namespace offapp
{
-
-
- //= ConnectionPoolConfig
-
class ConnectionPoolConfig
{
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 1ab5e735cb36..5d62d4d44c67 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -294,10 +294,6 @@ namespace offapp
}
}
-
- //= ConnectionPoolOptionsPage
-
-
ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet)
: SfxTabPage(_pParent, "ConnPoolPage", "cui/ui/connpooloptions.ui", &_rAttrSet)
{
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index d8e4c2556df8..d06ec8893afd 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -30,8 +30,6 @@
namespace offapp
{
- //= ConnectionPoolOptionsPage
-
class DriverListControl;
class ConnectionPoolOptionsPage : public SfxTabPage
{
diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx
index 639ee0e804b8..b735076835b7 100644
--- a/cui/source/options/connpoolsettings.cxx
+++ b/cui/source/options/connpoolsettings.cxx
@@ -23,11 +23,6 @@
namespace offapp
{
-
-
- //= DriverPooling
-
-
DriverPooling::DriverPooling( const OUString& _rName, bool _bEnabled, const sal_Int32 _nTimeout )
:sName(_rName)
,bEnabled(_bEnabled)
@@ -43,17 +38,10 @@ namespace offapp
&& (nTimeoutSeconds == _rR.nTimeoutSeconds);
}
-
- //= DriverPoolingSettings
-
-
DriverPoolingSettings::DriverPoolingSettings()
{
}
-
- //= DriverPoolingSettingsItem
-
TYPEINIT1( DriverPoolingSettingsItem, SfxPoolItem )
DriverPoolingSettingsItem::DriverPoolingSettingsItem( sal_uInt16 _nId, const DriverPoolingSettings &_rSettings )
diff --git a/cui/source/options/connpoolsettings.hxx b/cui/source/options/connpoolsettings.hxx
index 1cb0205683b6..26fa8627f240 100644
--- a/cui/source/options/connpoolsettings.hxx
+++ b/cui/source/options/connpoolsettings.hxx
@@ -31,10 +31,6 @@
namespace offapp
{
-
-
- //= DriverPooling
-
struct DriverPooling
{
OUString sName;
@@ -47,9 +43,6 @@ namespace offapp
bool operator != (const DriverPooling& _rR) const { return !operator ==(_rR); }
};
-
- //= DriverPoolingSettings
-
class DriverPoolingSettings
{
protected:
@@ -74,9 +67,6 @@ namespace offapp
void push_back(const DriverPooling& _rElement) { m_aDrivers.push_back(_rElement); }
};
-
- //= DriverPoolingSettingsItem
-
class DriverPoolingSettingsItem : public SfxPoolItem
{
protected:
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 2d7e8a58916a..ba17c70246ef 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -451,7 +451,7 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, OUString*, _pName )
return 1L;
}
-} // namespace svx
+}
diff --git a/cui/source/options/dbregisterednamesconfig.cxx b/cui/source/options/dbregisterednamesconfig.cxx
index 0d06346586d4..7fe44a7b9ff4 100644
--- a/cui/source/options/dbregisterednamesconfig.cxx
+++ b/cui/source/options/dbregisterednamesconfig.cxx
@@ -41,10 +41,6 @@ namespace svx
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::container;
-
- //= DbRegisteredNamesConfig
-
-
void DbRegisteredNamesConfig::GetOptions( SfxItemSet& _rFillItems )
{
DatabaseRegistrations aSettings;
@@ -127,7 +123,7 @@ namespace svx
}
-} // namespace svx
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/dbregisterednamesconfig.hxx b/cui/source/options/dbregisterednamesconfig.hxx
index a140ae40cfb1..48311d031913 100644
--- a/cui/source/options/dbregisterednamesconfig.hxx
+++ b/cui/source/options/dbregisterednamesconfig.hxx
@@ -25,10 +25,6 @@ class SfxItemSet;
namespace svx
{
-
-
- //= DbRegisteredNamesConfig
-
class DbRegisteredNamesConfig
{
@@ -38,7 +34,7 @@ namespace svx
};
-} // namespace svx
+}
#endif // INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTEREDNAMESCONFIG_HXX
diff --git a/cui/source/options/dbregistersettings.cxx b/cui/source/options/dbregistersettings.cxx
index f3bc7169cef2..f3fca6a033f2 100644
--- a/cui/source/options/dbregistersettings.cxx
+++ b/cui/source/options/dbregistersettings.cxx
@@ -25,10 +25,6 @@
namespace svx
{
-
-
- //= DatabaseMapItem
-
TYPEINIT1( DatabaseMapItem, SfxPoolItem )
DatabaseMapItem::DatabaseMapItem( sal_uInt16 _nId, const DatabaseRegistrations& _rRegistrations )
@@ -59,7 +55,7 @@ namespace svx
-} // namespace svx
+}
diff --git a/cui/source/options/dbregistersettings.hxx b/cui/source/options/dbregistersettings.hxx
index 2fdc4436b714..434a1845b610 100644
--- a/cui/source/options/dbregistersettings.hxx
+++ b/cui/source/options/dbregistersettings.hxx
@@ -63,9 +63,6 @@ namespace svx
typedef ::std::map< OUString, DatabaseRegistration > DatabaseRegistrations;
-
- //= DatabaseMapItem
-
class DatabaseMapItem : public SfxPoolItem
{
protected:
@@ -84,7 +81,7 @@ namespace svx
};
-} // namespace svx
+}
#endif // INCLUDED_CUI_SOURCE_OPTIONS_DBREGISTERSETTINGS_HXX
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index 52e03509b068..f5f24b741380 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -39,10 +39,6 @@ namespace svx
using namespace ::com::sun::star::ucb;
using namespace ::svt;
-
- //= ODocumentLinkDialog
-
-
ODocumentLinkDialog::ODocumentLinkDialog( vcl::Window* _pParent, bool _bCreateNew )
: ModalDialog(_pParent, "DatabaseLinkDialog",
"cui/ui/databaselinkdialog.ui")
@@ -217,7 +213,7 @@ namespace svx
}
-} // namespace svx
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx
index ea56e8eb10ba..899c3f3ee8d0 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -31,10 +31,6 @@
namespace svx
{
-
-
- //= ODocumentLinkDialog
-
/** dialog for editing document links associated with data sources
*/
class ODocumentLinkDialog : public ModalDialog
@@ -72,7 +68,7 @@ namespace svx
};
-} // namespace svx
+}
#endif // INCLUDED_CUI_SOURCE_OPTIONS_DOCLINKDIALOG_HXX
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 2162707f839a..404ef64bc7e2 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -76,6 +76,6 @@ void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const OUString& rT
}
}
-} // namespace svx
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/sdbcdriverenum.cxx b/cui/source/options/sdbcdriverenum.cxx
index 9a35a3bdb21c..b32ccfca7767 100644
--- a/cui/source/options/sdbcdriverenum.cxx
+++ b/cui/source/options/sdbcdriverenum.cxx
@@ -34,9 +34,6 @@ namespace offapp
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::sdbc;
-
- //= ODriverEnumerationImpl
-
class ODriverEnumerationImpl
{
protected:
@@ -74,10 +71,6 @@ namespace offapp
}
}
-
- //= ODriverEnumeration
-
-
ODriverEnumeration::ODriverEnumeration() throw()
:m_pImpl(new ODriverEnumerationImpl)
{
diff --git a/cui/source/options/sdbcdriverenum.hxx b/cui/source/options/sdbcdriverenum.hxx
index 360aa2c3f162..5d75b2a191ef 100644
--- a/cui/source/options/sdbcdriverenum.hxx
+++ b/cui/source/options/sdbcdriverenum.hxx
@@ -30,10 +30,6 @@
namespace offapp
{
-
-
- //= ODriverEnumeration
-
class ODriverEnumerationImpl;
/** simple class for accessing SDBC drivers registered within the office
<p>Rather small, introduced to not contaminate other instances with the
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index aea7fd280645..a7b788120849 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -90,7 +90,7 @@ void SecurityOptionsDialog::dispose()
ModalDialog::dispose();
}
-} // namespace svx
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/securityoptions.hxx b/cui/source/options/securityoptions.hxx
index 216e372e945f..19884eefa9a4 100644
--- a/cui/source/options/securityoptions.hxx
+++ b/cui/source/options/securityoptions.hxx
@@ -30,10 +30,6 @@ class SvtSecurityOptions;
namespace svx
{
-
-
- //= class SecurityOptionsDialog
-
class SecurityOptionsDialog : public ModalDialog
{
private:
@@ -63,7 +59,7 @@ namespace svx
};
-} // namespace svx
+}
#endif // INCLUDED_CUI_SOURCE_OPTIONS_SECURITYOPTIONS_HXX
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index e97f790b3a32..ffa1ef28c524 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -326,7 +326,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl)
}
-} // namespace svx
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx
index a9d1b566d592..36aac634c644 100644
--- a/cui/source/options/webconninfo.hxx
+++ b/cui/source/options/webconninfo.hxx
@@ -41,9 +41,6 @@ namespace svx
virtual void Resize() SAL_OVERRIDE;
};
-
- //= class WebConnectionIfoDialog
-
class WebConnectionInfoDialog : public ModalDialog
{
private:
@@ -68,7 +65,7 @@ namespace svx
};
-} // namespace svx
+}
#endif // INCLUDED_CUI_SOURCE_OPTIONS_WEBCONNINFO_HXX
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 55dd19c00f7a..94012e5dc25e 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -439,6 +439,6 @@ IMPL_LINK_NOARG(AlignmentTabPage, UpdateEnableHdl)
-} // namespace svx
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx
index 47f77950d706..6dc3b8e7ffee 100644
--- a/cui/source/tabpages/borderconn.cxx
+++ b/cui/source/tabpages/borderconn.cxx
@@ -291,6 +291,6 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet,
-} // namespace svx
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/borderconn.hxx b/cui/source/tabpages/borderconn.hxx
index 0cc65a0152f1..1761fe5479ee 100644
--- a/cui/source/tabpages/borderconn.hxx
+++ b/cui/source/tabpages/borderconn.hxx
@@ -55,7 +55,7 @@ sfx::ItemConnectionBase* CreateShadowConnection( const SfxItemSet& rItemSet,
-} // namespace svx
+}
#endif