[Libreoffice-commits] core.git: 2 commits - cui/source framework/source svx/source
Philipp Riemer
ruderphilipp at gmail.com
Mon Sep 2 13:10:21 PDT 2013
cui/source/dialogs/cuifmsearch.cxx | 24 ------------------
framework/source/uiconfiguration/imagemanagerimpl.hxx | 1
svx/source/form/fmsrccfg.cxx | 20 +++------------
3 files changed, 4 insertions(+), 41 deletions(-)
New commits:
commit 6bb2da3f696d724117a1f3ff5e23e5a7fb3ed314
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Mon Sep 2 22:07:55 2013 +0200
fdo#62475 - remove visual noise
Change-Id: Ic944fc45aded66939a2fc1622536eb3f2d80d764
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index ff177e1..96faf47 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -47,7 +47,6 @@ using namespace ::com::sun::star::util;
#define MAX_HISTORY_ENTRIES 50
-//------------------------------------------------------------------------
void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
{
// init the engine
@@ -82,7 +81,6 @@ void FmSearchDialog::initCommon( const Reference< XResultSet >& _rxCursor )
m_pbClose.SetHelpText(String());
}
-//------------------------------------------------------------------------
FmSearchDialog::FmSearchDialog(Window* pParent, const OUString& sInitialText, const ::std::vector< OUString >& _rContexts, sal_Int16 nInitialContext,
const Link& lnkContextSupplier)
:ModalDialog(pParent, CUI_RES(RID_SVXDLG_SEARCHFORM))
@@ -188,7 +186,6 @@ FmSearchDialog::FmSearchDialog(Window* pParent, const OUString& sInitialText, co
Init(fmscInitial.strUsedFields, sInitialText);
}
-//------------------------------------------------------------------------
void FmSearchDialog::implMoveControls(
Control** _ppControls,
sal_Int32 _nControls,
@@ -208,7 +205,6 @@ void FmSearchDialog::implMoveControls(
SetSizePixel(sz);
}
-//------------------------------------------------------------------------
FmSearchDialog::~FmSearchDialog()
{
if (m_aDelayedPaint.IsActive())
@@ -225,7 +221,6 @@ FmSearchDialog::~FmSearchDialog()
delete m_pSearchEngine;
}
-//------------------------------------------------------------------------
void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sInitialText)
{
//the initialization of all the Controls
@@ -297,7 +292,6 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
FreeResource();
}
-//------------------------------------------------------------------------
sal_Bool FmSearchDialog::Close()
{
// If the close button is disabled and ESC is pressed in a dialog,
@@ -309,7 +303,6 @@ sal_Bool FmSearchDialog::Close()
return ModalDialog::Close();
}
-//------------------------------------------------------------------------
IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
{
if ((pButton == &m_rbSearchForText) || (pButton == &m_rbSearchForNull) || (pButton == &m_rbSearchForNotNull))
@@ -332,7 +325,6 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
return 0;
}
-//------------------------------------------------------------------------
IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
{
if (m_pbClose.IsEnabled())
@@ -378,7 +370,6 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
return 0;
}
-//------------------------------------------------------------------------
IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
{
if (&m_pbApproxSettings == pButton)
@@ -425,7 +416,6 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
return 0;
}
-//------------------------------------------------------------------------
IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
{
if ((!m_cmbSearchText.GetText().isEmpty()) || !m_rbSearchForText.IsChecked())
@@ -437,14 +427,12 @@ IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified)
return 0;
}
-//------------------------------------------------------------------------
IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*, EMPTYARG)
{
m_cmbSearchText.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
return 0;
}
-//------------------------------------------------------------------------
IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox*, pBox)
{
(void) pBox; // avoid warning
@@ -454,7 +442,6 @@ IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox*, pBox)
return 0;
}
-//------------------------------------------------------------------------
IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox)
{
(void) pBox; // avoid warning
@@ -469,7 +456,6 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox)
return 0;
}
-//------------------------------------------------------------------------
IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
{
sal_Bool bChecked = pBox->IsChecked();
@@ -554,7 +540,6 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
return 0;
}
-//------------------------------------------------------------------------
void FmSearchDialog::InitContext(sal_Int16 nContext)
{
FmSearchContext fmscContext;
@@ -601,14 +586,12 @@ void FmSearchDialog::InitContext(sal_Int16 nContext)
m_ftRecord.SetText(OUString::number(fmscContext.xCursor->getRow()));
}
-//------------------------------------------------------------------------
IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox*, pBox)
{
InitContext(pBox->GetSelectEntryPos());
return 0L;
}
-//------------------------------------------------------------------------
void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
{
// when the controls shall be disabled their paint is turned off and then turned on again after a delay
@@ -684,7 +667,6 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
}
-//------------------------------------------------------------------------
void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable)
{
sal_Bool bSearchingForText = m_rbSearchForText.IsChecked();
@@ -708,7 +690,6 @@ void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable)
m_cbCase.Enable (bEnable && bEnableRedundants);
}
-//------------------------------------------------------------------------
void FmSearchDialog::EnableControlPaint(sal_Bool bEnable)
{
Control* pAffectedControls[] = { &m_flSearchFor, &m_rbSearchForText, &m_cmbSearchText, &m_rbSearchForNull, &m_rbSearchForNotNull,
@@ -730,14 +711,12 @@ void FmSearchDialog::EnableControlPaint(sal_Bool bEnable)
}
}
-//------------------------------------------------------------------------
IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint)
{
EnableControlPaint(sal_True);
return 0L;
}
-//------------------------------------------------------------------------
void FmSearchDialog::OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_Int16 nFieldPos)
{
FmFoundRecordInformation friInfo;
@@ -756,7 +735,6 @@ void FmSearchDialog::OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_I
m_cmbSearchText.GrabFocus();
}
-//------------------------------------------------------------------------
IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
{
SolarMutexGuard aGuard;
@@ -817,7 +795,6 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
return 0L;
}
-//------------------------------------------------------------------------
void FmSearchDialog::LoadParams()
{
FmSearchParams aParams(m_pConfig->getParams());
@@ -909,7 +886,6 @@ void FmSearchDialog::LoadParams()
LINK(this, FmSearchDialog, OnClickedFieldRadios).Call(&m_rbSearchForText);
}
-//------------------------------------------------------------------------
void FmSearchDialog::SaveParams() const
{
if (!m_pConfig)
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 1e9e096..e2c78a2 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -22,18 +22,12 @@
#include <com/sun/star/i18n/TransliterationModules.hpp>
#include <comphelper/processfactory.hxx>
-
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::i18n;
-//........................................................................
namespace svxform
{
-//........................................................................
-
- // ====================================================================
- // = struct FmSearchParams - Parameter einer Suche
- // ====================================================================
+ // search parameters
FmSearchParams::FmSearchParams()
:nTransliterationFlags( 0 )
@@ -77,9 +71,7 @@ namespace svxform
nTransliterationFlags |= TransliterationModules_IGNORE_CASE;
}
- // ====================================================================
- // = maps from ascii values to int values
- // ====================================================================
+ // maps from ascii values to int values
struct Ascii2Int16
{
@@ -156,9 +148,7 @@ namespace svxform
return s_pDummy;
}
- // ====================================================================
- // = class FmSearchConfigItem - ein ConfigItem, dass sich Suchparameter merkt
- // ====================================================================
+ // class FmSearchConfigItem - a config item that stores search parameters
#define TA( c ) &c, getCppuType( &c )
@@ -295,8 +285,6 @@ namespace svxform
implTranslateToConfig();
}
-//........................................................................
-} // namespace svxform
-//........................................................................
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 3c48673ff7f9fe93e31c11604258f50db26986b3
Author: Philipp Riemer <ruderphilipp at gmail.com>
Date: Mon Sep 2 16:49:21 2013 +0200
Delete wrong comment
This indicates that there should follow the private methods in this class.
However, the visibility constraint "private" was never in this code since it
was added in 2009. So I delete it.
See:
$> git log -u -- framework/source/uiconfiguration/imagemanagerimpl.hxx
ca00697e3dae9a03573d11281fc8d9a4ee391d3d (Sep 8th 2009)
Change-Id: Iac82b79d8cf6cc0c796a5ee97be25d2d24f4fa48
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index 1892d9c..a0cd5a0 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -159,7 +159,6 @@ namespace framework
typedef ::std::vector< ::com::sun::star::ui::ConfigurationEvent > ConfigEventNotifyContainer;
- // private methods
void implts_initialize();
void implts_notifyContainerListener( const ::com::sun::star::ui::ConfigurationEvent& aEvent, NotifyOp eOp );
ImageList* implts_getUserImageList( ImageType nImageType );
More information about the Libreoffice-commits
mailing list