[Libreoffice-commits] core.git: basctl/inc cui/inc cui/source include/svtools svtools/source svx/inc sw/inc
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Feb 6 11:45:01 UTC 2020
basctl/inc/pch/precompiled_basctl.hxx | 5 -
cui/inc/pch/precompiled_cui.hxx | 5 -
cui/source/inc/numpages.hxx | 1
cui/source/tabpages/border.cxx | 1
include/svtools/ctrlbox.hxx | 26 ------
svtools/source/control/ctrlbox.cxx | 146 ----------------------------------
svx/inc/pch/precompiled_svx.hxx | 3
sw/inc/pch/precompiled_swui.hxx | 13 ++-
8 files changed, 15 insertions(+), 185 deletions(-)
New commits:
commit 17f83e391297f86f264dabd447d48280662b2435
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 5 19:45:45 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Feb 6 12:44:26 2020 +0100
drop newly unused FontSizeBox
Change-Id: I8a84ce74888e1d3c468251ddd3633aedf6339a11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88064
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index 7b967aea8de7..8c25e3543e5a 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-01 10:57:25 using:
+ Generated on 2020-02-05 19:54:23 using:
./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -108,7 +108,6 @@
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
#include <vcl/builderpage.hxx>
-#include <vcl/button.hxx>
#include <vcl/cairo.hxx>
#include <vcl/checksum.hxx>
#include <vcl/combobox.hxx>
@@ -122,7 +121,6 @@
#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
@@ -151,7 +149,6 @@
#include <vcl/scopedbitmapaccess.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
-#include <vcl/spinfld.hxx>
#include <vcl/split.hxx>
#include <vcl/status.hxx>
#include <vcl/svapp.hxx>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index 6b6d9001aa5c..8164c642b607 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-01-22 15:57:39 using:
+ Generated on 2020-02-05 19:54:35 using:
./bin/update_pch cui cui --cutoff=8 --exclude:system --include:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -119,7 +119,6 @@
#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/field.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
@@ -141,7 +140,6 @@
#include <vcl/salnativewidgets.hxx>
#include <vcl/scopedbitmapaccess.hxx>
#include <vcl/settings.hxx>
-#include <vcl/spinfld.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
#include <vcl/task.hxx>
@@ -283,7 +281,6 @@
#include <editeng/svxfont.hxx>
#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
-#include <i18nutil/i18nutildllapi.h>
#include <i18nutil/searchopt.hxx>
#include <i18nutil/transliteration.hxx>
#include <o3tl/cow_wrapper.hxx>
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 3a3cf0692259..7003be67704c 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -27,6 +27,7 @@
#include <editeng/svxenum.hxx>
#include <svtools/ctrlbox.hxx>
#include <vcl/customweld.hxx>
+#include <vcl/timer.hxx>
#include <cui/numberingpreview.hxx>
#define MN_GALLERY_ENTRY 100
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 107b01f4663f..b75e91d1bd66 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -29,6 +29,7 @@
#include <svx/dlgutil.hxx>
#include <dialmgr.hxx>
#include <sfx2/htmlmode.hxx>
+#include <vcl/field.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <svx/flagsdef.hxx>
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 30551c592dc2..7518688336ee 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -27,7 +27,6 @@
#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
#include <vcl/metric.hxx>
-#include <vcl/field.hxx>
#include <vcl/weld.hxx>
#include <memory>
@@ -383,31 +382,6 @@ private:
FontStyleBox& operator=(const FontStyleBox&) = delete;
};
-class SVT_DLLPUBLIC FontSizeBox : public MetricBox
-{
- bool bStdSize:1;
-
- using Window::ImplInit;
- SVT_DLLPRIVATE void ImplInit();
-
-protected:
- virtual sal_Int64 GetValueFromStringUnit(const OUString& rStr, FieldUnit eOutUnit) const override;
-
-public:
- FontSizeBox( vcl::Window* pParent, WinBits nWinStyle );
-
- void Reformat() override;
-
- void Fill( const FontMetric* pFontMetric, const FontList* pList );
-
- virtual void SetValue( sal_Int64 nNewValue, FieldUnit eInUnit ) override;
- virtual void SetValue( sal_Int64 nNewValue ) override;
-
-private:
- FontSizeBox( const FontSizeBox& ) = delete;
- FontSizeBox& operator =( const FontSizeBox& ) = delete;
-};
-
class SVT_DLLPUBLIC SvtFontSizeBox
{
FontMetric aFontMetric;
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 6ecbfd596bc5..5b0cb9fe018a 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -856,152 +856,6 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
m_xComboBox->thaw();
}
-FontSizeBox::FontSizeBox( vcl::Window* pParent, WinBits nWinSize ) :
- MetricBox( pParent, nWinSize )
-{
- EnableSelectAll();
- ImplInit();
-}
-
-void FontSizeBox::ImplInit()
-{
- EnableAutocomplete( false );
-
- bStdSize = false;
-
- SetShowTrailingZeros( false );
- SetDecimalDigits( 1 );
- SetMin( 20 );
- SetMax( 9999 );
- SetProminentEntryType( ProminentEntry::MIDDLE );
-}
-
-void FontSizeBox::Reformat()
-{
- FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
- long nNewValue = aFontSizeNames.Name2Size( GetText() );
- if ( nNewValue)
- {
- mnLastValue = nNewValue;
- return;
- }
-
- MetricBox::Reformat();
-}
-
-void FontSizeBox::Fill( const FontMetric* pFontMetric, const FontList* pList )
-{
- // query font sizes
- const sal_IntPtr* pTempAry;
- const sal_IntPtr* pAry = nullptr;
-
- if( pFontMetric )
- {
- pAry = pList->GetSizeAry( *pFontMetric );
- }
- else
- {
- pAry = FontList::GetStdSizeAry();
- }
-
- // first insert font size names (for simplified/traditional chinese)
- FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
- if ( pAry == FontList::GetStdSizeAry() )
- {
- // for standard sizes we don't need to bother
- if ( bStdSize && GetEntryCount() && aFontSizeNames.IsEmpty() )
- return;
- bStdSize = true;
- }
- else
- bStdSize = false;
-
- Selection aSelection = GetSelection();
- OUString aStr = GetText();
-
- Clear();
- sal_Int32 nPos = 0;
-
- if ( !aFontSizeNames.IsEmpty() )
- {
- if ( pAry == FontList::GetStdSizeAry() )
- {
- // for scalable fonts all font size names
- sal_Int32 nCount = aFontSizeNames.Count();
- for( sal_Int32 i = 0; i < nCount; i++ )
- {
- OUString aSizeName = aFontSizeNames.GetIndexName( i );
- sal_Int32 nSize = aFontSizeNames.GetIndexSize( i );
- ComboBox::InsertEntry( aSizeName, nPos );
- ComboBox::SetEntryData( nPos, reinterpret_cast<void*>(-nSize) ); // mark as special
- nPos++;
- }
- }
- else
- {
- // for fixed size fonts only selectable font size names
- pTempAry = pAry;
- while ( *pTempAry )
- {
- OUString aSizeName = aFontSizeNames.Size2Name( *pTempAry );
- if ( !aSizeName.isEmpty() )
- {
- ComboBox::InsertEntry( aSizeName, nPos );
- ComboBox::SetEntryData( nPos, reinterpret_cast<void*>(-(*pTempAry)) ); // mark as special
- nPos++;
- }
- pTempAry++;
- }
- }
- }
-
- // then insert numerical font size values
- pTempAry = pAry;
- while ( *pTempAry )
- {
- InsertValue( *pTempAry, FieldUnit::NONE, nPos );
- ComboBox::SetEntryData( nPos, reinterpret_cast<void*>(*pTempAry) );
- nPos++;
- pTempAry++;
- }
-
- SetText( aStr );
- SetSelection( aSelection );
-}
-
-void FontSizeBox::SetValue( sal_Int64 nNewValue, FieldUnit eInUnit )
-{
- sal_Int64 nTempValue = MetricField::ConvertValue( nNewValue, GetBaseValue(), GetDecimalDigits(), eInUnit, GetUnit() );
- FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
- // conversion loses precision; however font sizes should
- // never have a problem with that
- OUString aName = aFontSizeNames.Size2Name( static_cast<long>(nTempValue) );
- if ( !aName.isEmpty() && (GetEntryPos( aName ) != LISTBOX_ENTRY_NOTFOUND) )
- {
- mnLastValue = nTempValue;
- SetText( aName );
- SetEmptyFieldValueData( false );
- return;
- }
-
- MetricBox::SetValue( nNewValue, eInUnit );
-}
-
-void FontSizeBox::SetValue( sal_Int64 nNewValue )
-{
- SetValue( nNewValue, FieldUnit::NONE );
-}
-
-sal_Int64 FontSizeBox::GetValueFromStringUnit(const OUString& rStr, FieldUnit eOutUnit) const
-{
- FontSizeNames aFontSizeNames( GetSettings().GetUILanguageTag().getLanguageType() );
- sal_Int64 nValue = aFontSizeNames.Name2Size( rStr );
- if ( nValue )
- return MetricField::ConvertValue( nValue, GetBaseValue(), GetDecimalDigits(), GetUnit(), eOutUnit );
-
- return MetricBox::GetValueFromStringUnit( rStr, eOutUnit );
-}
-
SvtFontSizeBox::SvtFontSizeBox(std::unique_ptr<weld::ComboBox> p)
: pFontList(nullptr)
, nSavedValue(0)
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index c0d07f4bda97..2cb0154ce9b7 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-01 10:58:24 using:
+ Generated on 2020-02-05 19:54:54 using:
./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -109,7 +109,6 @@
#include <vcl/toolbox.hxx>
#include <vcl/transfer.hxx>
#include <vcl/treelistbox.hxx>
-#include <vcl/vclenum.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/virdev.hxx>
#include <vcl/weld.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index a7e5e6ac6385..fd997e9135b5 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-01 10:58:54 using:
+ Generated on 2020-02-05 19:55:24 using:
./bin/update_pch sw swui --cutoff=3 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -123,7 +123,6 @@
#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
@@ -259,6 +258,7 @@
#include <com/sun/star/i18n/XForbiddenCharacters.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/EventObject.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
@@ -275,7 +275,9 @@
#include <com/sun/star/script/XStarBasicAccess.hpp>
#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
+#include <com/sun/star/style/LineSpacing.hpp>
#include <com/sun/star/style/NumberingType.hpp>
+#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/table/BorderLineStyle.hpp>
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/PositionLayoutDir.hpp>
@@ -376,7 +378,8 @@
#include <o3tl/typed_flags_set.hxx>
#include <o3tl/underlyingenumvalue.hxx>
#include <officecfg/Office/Writer.hxx>
-#include <ooo/vba/word/WdSaveFormat.hpp>
+#include <ooo/vba/XHelperInterface.hpp>
+#include <ooo/vba/word/XParagraphFormat.hpp>
#include <salhelper/salhelperdllapi.h>
#include <salhelper/simplereferenceobject.hxx>
#include <sfx2/Metadatable.hxx>
@@ -496,10 +499,14 @@
#include <unotools/syslocale.hxx>
#include <unotools/transliterationwrapper.hxx>
#include <unotools/unotoolsdllapi.h>
+#include <vbahelper/vbadllapi.h>
+#include <vbahelper/vbahelper.hxx>
+#include <vbahelper/vbahelperinterface.hxx>
#endif // PCH_LEVEL >= 3
#if PCH_LEVEL >= 4
#include <IDocumentDeviceAccess.hxx>
#include <IDocumentRedlineAccess.hxx>
+#include <IDocumentSettingAccess.hxx>
#include <IMark.hxx>
#include <SwNumberTreeTypes.hxx>
#include <SwRewriter.hxx>
More information about the Libreoffice-commits
mailing list