[Libreoffice-commits] core.git: cui/source include/svx include/vcl sc/source svtools/source svx/inc svx/source sw/source vcl/source
cui/source/tabpages/border.cxx | 10
cui/source/tabpages/grfpage.cxx |5
cui/source/tabpages/transfrm.cxx|3
include/svx/transfrmhelper.hxx | 10
include/vcl/field.hxx | 26 -
include/vcl/fieldvalues.hxx | 67
sc/source/core/data/drwlayer.cxx|6
sc/source/ui/inc/tpdefaults.hxx |1
sc/source/ui/view/colrowba.cxx |4
svtools/source/control/ctrlbox.cxx |5
svx/inc/pch/precompiled_svx.hxx |4
svx/source/dialog/compressgraphicdialog.cxx |5
svx/source/dialog/dlgunit.hxx |5
svx/source/sidebar/possize/PosSizePropertyPanel.cxx |3
svx/source/stbctrls/pszctrl.cxx |4
sw/source/ui/frmdlg/column.cxx |5
sw/source/ui/misc/pgfnote.cxx |8
sw/source/uibase/utlui/prcntfld.cxx | 16 -
vcl/source/control/field.cxx| 297 +---
vcl/source/window/builder.cxx |3
20 files changed, 266 insertions(+), 221 deletions(-)
New commits:
commit 8389dc88a48b366ad7f3dd84129467175e18ab40
Author: Caolán McNamara
AuthorDate: Fri Feb 14 09:38:50 2020 +
Commit: Caolán McNamara
CommitDate: Fri Feb 14 14:31:50 2020 +0100
split out MetricField value conversion functions
Change-Id: I67a33bd2a5cb06dc66e471918b5c378044a2eff2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88679
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index b75e91d1bd66..8d8dd161a204 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -29,7 +29,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
@@ -734,7 +734,7 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
if( bWidthEq )
{
// Determine the width first as some styles can be missing
depending on it
-sal_Int64 nWidthPt =
static_cast(MetricField::ConvertDoubleValue(
+sal_Int64 nWidthPt =
static_cast(vcl::ConvertDoubleValue(
sal_Int64( nWidth ), m_xLineWidthMF->get_digits(),
MapUnit::MapTwip, FieldUnit::POINT ));
m_xLineWidthMF->set_value(nWidthPt, FieldUnit::POINT);
@@ -1158,7 +1158,7 @@ IMPL_LINK(SvxBorderTabPage, SelColHdl_Impl,
ColorListBox&, rColorBox, void)
IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl,
weld::MetricSpinButton&, void)
{
sal_Int64 nVal = m_xLineWidthMF->get_value(FieldUnit::NONE);
-nVal = static_cast(MetricField::ConvertDoubleValue(
+nVal = static_cast(vcl::ConvertDoubleValue(
nVal,
m_xLineWidthMF->get_digits(),
FieldUnit::POINT, MapUnit::MapTwip ));
@@ -1171,7 +1171,7 @@ IMPL_LINK_NOARG(SvxBorderTabPage, ModifyWidthHdl_Impl,
weld::MetricSpinButton&,
IMPL_LINK_NOARG(SvxBorderTabPage, SelStyleHdl_Impl, SvtLineListBox&, void)
{
sal_Int64 nVal = m_xLineWidthMF->get_value(FieldUnit::NONE);
-nVal = static_cast(MetricField::ConvertDoubleValue(
+nVal = static_cast(vcl::ConvertDoubleValue(
nVal,
m_xLineWidthMF->get_digits(),
FieldUnit::POINT, MapUnit::MapTwip ));
@@ -1352,7 +1352,7 @@ void SvxBorderTabPage::FillLineListBox_Impl()
}
sal_Int64 nVal = m_xLineWidthMF->get_value(FieldUnit::NONE);
-nVal = static_cast(MetricField::ConvertDoubleValue(nVal,
m_xLineWidthMF->get_digits(),
+nVal = static_cast(vcl::ConvertDoubleValue(nVal,
m_xLineWidthMF->get_digits(),
m_xLineWidthMF->get_unit(), MapUnit::MapTwip));
m_xLbLineStyle->SetWidth( nVal );
}
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 586f9806ce8d..d44610dd23b1 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -590,7 +591,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
SID_ATTR_GRAF_CROP ) ));
sal_Int64 nSpin = m_xLeftMF->normalize(aOrigSize.Width()) / 20;
-nSpin = MetricField::ConvertValue( nSpin, aOrigSize.Width(), 0,
+nSpin = vcl::ConvertValue( nSpin, aOrigSize.Width(), 0,
eUnit, m_xLeftMF->get_unit());
// if the margin is too big, it is set to 1/3 on both pages
@@ -618,7 +619,7 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound )
m_xLeftMF->set_increments(nSpin, nSpin * 10, FieldUnit::NONE);
[Libreoffice-commits] core.git: cui/source include/svx include/vcl sc/source sd/source sfx2/source svtools/source svx/source sw/source vcl/source vcl/unx
cui/source/customize/cfg.cxx |4
cui/source/dialogs/cuicharmap.cxx| 15 +--
cui/source/options/optjava.cxx |2
cui/source/tabpages/chardlg.cxx |7 -
include/svx/langbox.hxx |4
include/vcl/weld.hxx | 69 ++---
sc/source/ui/miscdlgs/mvtabdlg.cxx |3
sd/source/ui/dlg/PhotoAlbumDialog.cxx|8 -
sd/source/ui/dlg/custsdlg.cxx|5 -
sfx2/source/dialog/mgetempl.cxx |3
sfx2/source/doc/saveastemplatedlg.cxx|2
svtools/source/control/ctrlbox.cxx |4
svx/source/dialog/dlgctrl.cxx|4
svx/source/dialog/langbox.cxx| 53 +++---
sw/source/ui/dbui/customizeaddresslistdialog.cxx |4
sw/source/ui/frmdlg/column.cxx |3
sw/source/ui/misc/outline.cxx|2
sw/source/ui/table/tautofmt.cxx |4
sw/source/uibase/misc/numberingtypelistbox.cxx |3
sw/source/uibase/utlui/uitool.cxx|2
vcl/source/app/salvtables.cxx| 32 +++---
vcl/unx/generic/print/prtsetup.cxx |3
vcl/unx/gtk3/gtk3gtkinst.cxx | 114 +++
23 files changed, 209 insertions(+), 141 deletions(-)
New commits:
commit 3b21fed4b153e3bbf1d47c3073f31a3735538596
Author: Caolán McNamara
AuthorDate: Wed Oct 10 12:18:13 2018 +0100
Commit: Caolán McNamara
CommitDate: Wed Oct 10 16:57:12 2018 +0200
optimize adding a block of entries at one time
Change-Id: I9a59154fa445cf3c44ede3ceb1d09f408d906530
Reviewed-on: https://gerrit.libreoffice.org/61618
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index af8fea0455f7..3d48ae269a56 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1971,7 +1971,7 @@ IMPL_LINK_NOARG(SvxMainMenuOrganizerDialog, ModifyHdl,
weld::Entry&, void)
const int nNewMenuPos = m_xMenuListBox->find_id(m_sNewMenuEntryId);
const int nOldSelection = m_xMenuListBox->get_selected_index();
m_xMenuListBox->remove(nNewMenuPos);
-m_xMenuListBox->insert(nNewMenuPos, m_sNewMenuEntryId,
pNewEntryData->GetName(), nullptr, nullptr);
+m_xMenuListBox->insert(nNewMenuPos, pNewEntryData->GetName(),
&m_sNewMenuEntryId, nullptr, nullptr);
m_xMenuListBox->select(nOldSelection);
}
@@ -2009,7 +2009,7 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl,
weld::Button&, rButton, void )
OUString sId = m_xMenuListBox->get_id(nSourceEntry);
OUString sEntry = m_xMenuListBox->get_text(nSourceEntry);
m_xMenuListBox->remove(nSourceEntry);
-m_xMenuListBox->insert(nTargetEntry, sId, sEntry, nullptr, nullptr);
+m_xMenuListBox->insert(nTargetEntry, sEntry, &sId, nullptr, nullptr);
m_xMenuListBox->select(nTargetEntry);
UpdateButtonStates();
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index c0de50c1e564..4ffc213003ca 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -422,17 +422,18 @@ void SvxCharacterMap::init()
OUString aDefStr( aFont.GetFamilyName() );
OUString aLastName;
int nCount = m_xVirDev->GetDevFontCount();
-m_xFontLB->freeze();
+std::vector aEntries;
+aEntries.reserve(nCount);
for (int i = 0; i < nCount; ++i)
{
OUString aFontName( m_xVirDev->GetDevFont( i ).GetFamilyName() );
if (aFontName != aLastName)
{
aLastName = aFontName;
-m_xFontLB->append(OUString::number(i), aFontName);
+aEntries.emplace_back(aFontName, OUString::number(i));
}
}
-m_xFontLB->thaw();
+m_xFontLB->insert_vector(aEntries, true);
// the font may not be in the list =>
// try to find a font name token in list and select found font,
// else select topmost entry
@@ -596,14 +597,12 @@ void SvxCharacterMap::SetCharFont( const vcl::Font& rFont
)
void SvxCharacterMap::fillAllSubsets(weld::ComboBox& rListBox)
{
SubsetMap aAll(nullptr);
-rListBox.clear();
-rListBox.freeze();
+std::vector aEntries;
for (auto & subset : aAll.GetSubsetMap())
-rListBox.append_text(subset.GetName());
-rListBox.thaw();
+aEntries.emplace_back(subset.GetName());
+rListBox.insert_vector(aEntries, true);
}
-
void SvxCharacterMap::insertCharToDoc(const OUString& sGlyph)
{
if(sGlyph.isEmpty())
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index f115faedc701..9b3660d35592 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -804,7 +804,7 @@ void SvxJavaParameterDlg::EditParameter()
if ( !editedCla
[Libreoffice-commits] core.git: cui/source include/svx include/vcl sc/source starmath/source svtools/source svx/source vcl/generic vcl/inc vcl/qa vcl/quartz vcl/source vcl/unx vcl/win
cui/source/dialogs/cuicharmap.cxx | 12 +++---
include/svx/charmap.hxx |2 -
include/vcl/outdev.hxx |2 -
sc/source/filter/excel/xistyle.cxx | 50 ++--
starmath/source/dialog.cxx |8 ++--
svtools/source/misc/sampletext.cxx | 10 ++---
svx/source/dialog/charmap.cxx | 48 +--
vcl/generic/fontmanager/fontmanager.cxx |8 ++--
vcl/generic/print/genpspgraphics.cxx|4 +-
vcl/inc/quartz/salgdi.h |2 -
vcl/inc/unx/gcach_ftyp.hxx |4 +-
vcl/inc/win/salgdi.h|6 +--
vcl/qa/cppunit/fontcharmap.cxx | 12 +++---
vcl/quartz/salgdi.cxx | 42
vcl/source/filter/wmf/wmfwr.cxx |8 ++--
vcl/source/outdev/font.cxx | 22 ++--
vcl/unx/generic/gdi/cairotextrender.cxx |4 +-
vcl/unx/generic/gdi/gcach_ftyp.cxx | 26 +++---
vcl/win/gdi/salfont.cxx | 56
19 files changed, 163 insertions(+), 163 deletions(-)
New commits:
commit 536d0e27f05d9db7469bd8a3571c87b2ea885367
Author: Chris Sherlock
Date: Sun Jan 10 21:37:22 2016 +1100
Cleanup FontCharMapPtr variable prefixes
Change-Id: Ib106b91ab71ee45d5ad469d0beaf4ebaef8b57e1
Reviewed-on: https://gerrit.libreoffice.org/21306
Tested-by: Jenkins
Reviewed-by: Chris Sherlock
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index ee26bca..b17931c 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -455,9 +455,9 @@ IMPL_LINK_NOARG_TYPED(SvxCharacterMap, FontSelectHdl,
ListBox&, void)
bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL);
if( bNeedSubset )
{
-FontCharMapPtr pFontCharMap( new FontCharMap() );
-m_pShowSet->GetFontCharMap( pFontCharMap );
-pSubsetMap = new SubsetMap( pFontCharMap );
+FontCharMapPtr xFontCharMap( new FontCharMap() );
+m_pShowSet->GetFontCharMap( xFontCharMap );
+pSubsetMap = new SubsetMap( xFontCharMap );
// update subset listbox for new font's unicode subsets
// TODO: is it worth to improve the stupid linear search?
@@ -600,9 +600,9 @@ void SvxCharacterMap::selectCharByCode(Radix radix)
// Convert the code back to a character using the appropriate radix
sal_UCS4 cChar = aCodeString.toUInt32(static_cast (radix));
// Use FontCharMap::HasChar(sal_UCS4 cChar) to see if the desired
character is in the font
-FontCharMapPtr pFontCharMap(new FontCharMap());
-m_pShowSet->GetFontCharMap(pFontCharMap);
-if (pFontCharMap->HasChar(cChar))
+FontCharMapPtr xFontCharMap(new FontCharMap());
+m_pShowSet->GetFontCharMap(xFontCharMap);
+if (xFontCharMap->HasChar(cChar))
// Select the corresponding character
SetChar(cChar);
}
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 963e962..1574d18 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -105,7 +105,7 @@ private:
sal_Int32 nSelectedIndex;
-FontCharMapPtr mpFontCharMap;
+FontCharMapPtr mxFontCharMap;
SizemaFontSize;
VclPtr aVscrollSB;
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index c8e397b..ea706eb 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -1260,7 +1260,7 @@ public:
FontMetric GetFontMetric() const;
FontMetric GetFontMetric( const vcl::Font& rFont ) const;
-boolGetFontCharMap( FontCharMapPtr& rFontCharMap )
const;
+boolGetFontCharMap( FontCharMapPtr& rxFontCharMap
) const;
boolGetFontCapabilities( vcl::FontCapabilities&
rFontCapabilities ) const;
/** Retrieve detailed font information in platform independent structure
diff --git a/sc/source/filter/excel/xistyle.cxx
b/sc/source/filter/excel/xistyle.cxx
index 05c1516..b663c78 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -462,41 +462,41 @@ void XclImpFont::GuessScriptType()
if( OutputDevice* pPrinter = GetPrinter() )
{
vcl::Font aFont( maData.maName, Size( 0, 10 ) );
-FontCharMapPtr pCharMap;
+FontCharMapPtr xFontCharMap;
pPrinter->SetFont( aFont );
-if( pPrinter->GetFontCharMap( pCharMap ) )
+if( pPrinter->GetFontCharMap( xFontCharMap ) )
{
// CJK fonts
mbHasAsian =
-pCharMap->HasChar( 0x3041 ) || // 3040-309F: Hiragana
-pCharMap->HasChar( 0x30A1 ) || // 30A0-30FF: Katakana
-pCharMap->HasChar( 0x3111 ) || // 3100-312F: Bopomofo
-pCharMap->HasChar( 0x3131 ) || // 3130-318F: Hangul
Co
[Libreoffice-commits] core.git: cui/source include/svx include/vcl sc/source starmath/source svtools/source svx/source vcl/generic vcl/headless vcl/inc vcl/qa vcl/quartz vcl/source vcl/unx vcl/win
cui/source/dialogs/cuicharmap.cxx |6
include/svx/charmap.hxx |2
include/svx/ucsubset.hxx|4
include/vcl/metric.hxx | 39 ++-
include/vcl/outdev.hxx |5
sc/source/filter/excel/xistyle.cxx | 50 ++--
starmath/source/dialog.cxx |8
svtools/source/misc/sampletext.cxx | 10
svx/source/dialog/charmap.cxx | 40 +--
vcl/generic/fontmanager/fontmanager.cxx |4
vcl/generic/glyphs/gcach_ftyp.cxx | 13 -
vcl/generic/glyphs/gcach_ftyp.hxx |4
vcl/generic/print/genpspgraphics.cxx|6
vcl/headless/svptext.cxx|6
vcl/inc/generic/genpspgraphics.h|2
vcl/inc/generic/glyphcache.hxx |4
vcl/inc/headless/svpgdi.hxx |3
vcl/inc/impfont.hxx | 24 -
vcl/inc/quartz/salgdi.h |8
vcl/inc/salgdi.hxx | 19 -
vcl/inc/unx/salgdi.h|7
vcl/inc/win/salgdi.h|6
vcl/qa/cppunit/fontcharmap.cxx | 12
vcl/quartz/salgdi.cxx | 30 +-
vcl/source/filter/wmf/wmfwr.cxx |9
vcl/source/gdi/impfont.cxx | 393 ++--
vcl/source/outdev/font.cxx | 24 +
vcl/unx/generic/gdi/salgdi3.cxx |9
vcl/win/source/gdi/salgdi3.cxx | 40 +--
29 files changed, 406 insertions(+), 381 deletions(-)
New commits:
commit f6d61562d41b8a49449d881da66a3d8fa519487f
Author: Chris Sherlock
Date: Mon Oct 6 18:16:16 2014 +1100
vcl: Make ImplFontCharMap a pImpl and move functions to FontCharMap
To do this, I've made FontCharMap a friend class for ImplFontCharMap,
and have moved the functions directly into FontCharMap. In this patch,
I am attempting to stop the direct use of ImplFontCharMap by anything
other than FontCharMap. However, FontCharMap itself requires a
refcounter, so we will use FontCharMapPtr to access the font character
map.
Change-Id: I509b990a8cbd911c5cc1572c7d24fc5348ca06d9
Reviewed-on: https://gerrit.libreoffice.org/11823
Reviewed-by: Chris Sherlock
Tested-by: Chris Sherlock
diff --git a/cui/source/dialogs/cuicharmap.cxx
b/cui/source/dialogs/cuicharmap.cxx
index 2d46a79..94898e69 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -446,9 +446,9 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl)
bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL);
if( bNeedSubset )
{
-FontCharMap aFontCharMap;
-m_pShowSet->GetFontCharMap( aFontCharMap );
-pSubsetMap = new SubsetMap( &aFontCharMap );
+FontCharMapPtr pFontCharMap( new FontCharMap() );
+m_pShowSet->GetFontCharMap( pFontCharMap );
+pSubsetMap = new SubsetMap( pFontCharMap );
// update subset listbox for new font's unicode subsets
// TODO: is it worth to improve the stupid linear search?
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 1615fa2..7810dda 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -111,7 +111,7 @@ private:
sal_Int32 nSelectedIndex;
-FontCharMap maFontCharMap;
+FontCharMapPtr mpFontCharMap;
ScrollBar aVscrollSB;
private:
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index 4cf0b45..a2a8a7e 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -63,7 +63,7 @@ typedef ::std::list SubsetList;
class SVX_DLLPUBLIC SubsetMap : private Resource
{
public:
-SubsetMap( const FontCharMap* );
+SubsetMap( const FontCharMapPtr );
const Subset* GetSubsetByUnicode( sal_UCS4 ) const;
const Subset* GetNextSubset( bool bFirst ) const;
@@ -73,7 +73,7 @@ private:
mutable SubsetList::const_iterator maSubsetIterator;
SVX_DLLPRIVATE voidInitList();
-SVX_DLLPRIVATE voidApplyCharMap( const FontCharMap* );
+SVX_DLLPRIVATE voidApplyCharMap( const FontCharMapPtr );
};
#endif
diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx
index ca53b65..e9872a9 100644
--- a/include/vcl/metric.hxx
+++ b/include/vcl/metric.hxx
@@ -28,9 +28,11 @@
class ImplFontMetric;
class ImplFontCharMap;
+class CmapResult;
typedef sal_uInt32 sal_UCS4;
typedef boost::intrusive_ptr< ImplFontCharMap > ImplFontCharMapPtr;
+typedef boost::intrusive_ptr< FontCharMap > FontCharMapPtr;
namespace vcl {
@@ -96,16 +98,20 @@ inline std::basic_ostream & operator <<(
class VCL_DLLPUBLIC FontCharMap
{
-private:
-ImplFontCharMapPtr mpImplFontCharMap;
-
public:
/** A new FontCharMap is created based on a "default" map, which includes
all codepoints in the Unicode BMP range, including surrogates.
**/
FontCharMap();
+
[Libreoffice-commits] core.git: cui/source include/svx include/vcl sc/source
cui/source/dialogs/passwdomdlg.cxx |2 +-
cui/source/factory/dlgfact.cxx |4 ++--
cui/source/factory/dlgfact.hxx |2 +-
cui/source/tabpages/autocdlg.cxx |2 +-
include/svx/svxdlg.hxx |2 +-
include/vcl/window.hxx |2 +-
sc/source/ui/miscdlgs/mvtabdlg.cxx |4 ++--
7 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit b32b45c50cc7b782554b0da722913f697434647d
Author: Stephan Bergmann
Date: Tue Jan 14 14:56:42 2014 +0100
nFlags parameter to Window::Hide appears effectively unused
...there was a handful of Hide(true) calls, which would happen to actually
mean
Show(false, SHOW_NOPARENTUPDATE)
but I assume those were typos rather than genuine requests for
SHOW_NOPARENTUPDATE.
Change-Id: I20310d58437bb556f95965885f82784f855b517d
diff --git a/cui/source/dialogs/passwdomdlg.cxx
b/cui/source/dialogs/passwdomdlg.cxx
index b73b71d..30e3300 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -163,7 +163,7 @@
PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
m_aMoreFewerOptionsBTN.Enable( bIsPasswordToModify );
if (!bIsPasswordToModify)
-m_aMoreFewerOptionsBTN.Hide( sal_True );
+m_aMoreFewerOptionsBTN.Hide();
}
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 3ab8e86..2090e59 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -543,9 +543,9 @@ OUString AbstractURLDlg_Impl::GetName() const
return pDlg->GetName();
}
-void AbstractSvxHlinkDlgMarkWnd_Impl::Hide( sal_uInt16 nFlags )
+void AbstractSvxHlinkDlgMarkWnd_Impl::Hide()
{
-((Window*)pDlg)->Hide( nFlags );
+((Window*)pDlg)->Hide();
}
void AbstractSvxHlinkDlgMarkWnd_Impl::SetSizePixel( const Size& rNewSize )
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index cee1226..0d17161 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -278,7 +278,7 @@ class SvxHlinkDlgMarkWnd;
class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd
{
DECL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl,SvxHlinkDlgMarkWnd)
-virtual voidHide( sal_uInt16 nFlags = 0 );
+virtual voidHide() SAL_OVERRIDE;
virtual sal_BoolIsVisible() const ;
virtual voidInvalidate( sal_uInt16 nFlags = 0 );
virtual voidSetSizePixel( const Size& rNewSize );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 5f5c69e..c4e7f9e 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1778,7 +1778,7 @@ OfaQuoteTabPage::OfaQuoteTabPage(Window* pParent, const
SfxItemSet& rSet)
sHeader += "\t";
m_pSwCheckLB->InsertHeaderEntry( sHeader, HEADERBAR_APPEND,
HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED);
-m_pCheckLB->Hide(true);
+m_pCheckLB->Hide();
}
else
{
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 34ae403..4d51d1c 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -140,7 +140,7 @@ public:
// in class Window
virtual voidSetSizePixel( const Size& rNewSize ) = 0;
virtual SizeGetSizePixel() const = 0;
-virtual voidHide( sal_uInt16 nFlags = 0 ) = 0;
+virtual voidHide() = 0;
virtual sal_BoolIsVisible() const = 0;
virtual voidInvalidate( sal_uInt16 nFlags = 0 ) = 0;
};
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index fc7e2e0..991daf6 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -721,7 +721,7 @@ public:
Dialog* GetParentDialog() const;
voidShow( sal_Bool bVisible = sal_True, sal_uInt16 nFlags
= 0 );
-voidHide( sal_uInt16 nFlags = 0 ) { Show( sal_False,
nFlags ); }
+voidHide() { Show( sal_False ); }
sal_BoolIsVisible() const;
sal_BoolIsReallyVisible() const;
sal_BoolIsReallyShown() const;
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx
b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index 7c169ba..97f2258 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -196,7 +196,7 @@ void ScMoveTableDlg::CheckNewTabName()
}
else
{
-pFtWarn->Hide(sal_True);
+pFtWarn->Hide();
pFtWarn->SetControlBackground();
pFtWarn->SetText(OUString());
pBtnOk->Enable();
@@ -225,7 +225,7 @@ void ScMoveTableDlg::Init()
pBtnMove->Check( true );
pBtnCopy->Check( false );
pEdTabName->Enable(false);
-pFtWarn->Hide(sal_True);
+pFtWarn->Hide();
InitDocListBox();
SelHdl( pLbDoc );
}
___
Libreoffice-comm
