[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/inc/numpages.hxx | 13
cui/source/tabpages/numpages.cxx | 113 ---
cui/source/tabpages/page.cxx | 21 +--
cui/source/tabpages/page.src | 29 +++---
4 files changed, 111 insertions(+), 65 deletions(-)
New commits:
commit cf05f252ea3af8f6a1543ec52081f53cbcb2cc07
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date: Mon Jun 25 09:27:16 2012 +0300
fdo#42558 added Arabic Abjad and other known numberings to Page Numbering
(cherry picked from commit e5d61932cb6c92954d808cf8d65a460ea19d5799)
fdo#42558 consolidated duplicated code
* Moved almost identical code of
SvxNumOptionsTabPage::SvxNumOptionsTabPage() and
SvxPageDescPage::SvxPageDescPage() into static
SvxNumOptionsTabPage::GetI18nNumbering()
* Removed now unnecessary includes and using namespace directives
(cherry picked from commit 88a083f8be05449630c9e2af30474281fd0d8af2)
fdo#42558 Re-adding the None option to the page numbering
(cherry picked from commit 8c004e70aa44910d28d27e0b4cf837b3bbb85c5c)
Squashed all three commits into one.
Signed-off-by: Eike Rathke er...@redhat.com
Change-Id: I3be59d92da8444f12855fcfac78c465d2a547b2d
Reviewed-on: https://gerrit.libreoffice.org/1070
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 00f0ddd..ee2134c 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -356,6 +356,19 @@ class SvxNumOptionsTabPage : public SfxTabPage
ListBoxGetCharFmtListBox() {return aCharFmtLB;}
voidSetModified(sal_Bool bRepaint = sal_True);
virtual voidPageCreated(SfxAllItemSet aSet);
+
+/** Get the numberings provided by the i18n framework (CTL, Asian, ...) and
+add them to the listbox. Extended numbering schemes present in the
+resource and already in the listbox but not offered by the i18n
+framework per configuration are removed.
+
+@param nDoNotRemove
+A value that shall not be removed, i.e. the ugly 0x88
+(SVX_NUM_BITMAP|0x80)
+Pass ::std::numeric_limitssal_uInt16::max() if there is no such
+restriction.
+ */
+static void GetI18nNumbering( ListBox rFmtLB, sal_uInt16
nDoNotRemove );
};
//
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index ad962f6..1156021 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1036,6 +1036,64 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, LinkBmpHdl_Impl)
return 0;
}
+// static
+void SvxNumOptionsTabPage::GetI18nNumbering( ListBox rFmtLB, sal_uInt16
nDoNotRemove )
+{
+
+ReferenceXDefaultNumberingProvider xDefNum = lcl_GetNumberingProvider();
+ReferenceXNumberingTypeInfo xInfo(xDefNum, UNO_QUERY);
+
+// Extended numbering schemes present in the resource but not offered by
+// the i18n framework per configuration must be removed from the listbox.
+// Do not remove a special entry matching nDoNotRemove.
+const sal_uInt16 nDontRemove = 0x;
+::std::vector sal_uInt16 aRemove( rFmtLB.GetEntryCount(), nDontRemove);
+for (size_t i=0; iaRemove.size(); ++i)
+{
+sal_uInt16 nEntryData = (sal_uInt16)(sal_uLong)rFmtLB.GetEntryData(
+sal::static_int_cast sal_uInt16 (i));
+if (nEntryData NumberingType::CHARS_LOWER_LETTER_N nEntryData !=
nDoNotRemove)
+aRemove[i] = nEntryData;
+}
+if(xInfo.is())
+{
+Sequencesal_Int16 aTypes = xInfo-getSupportedNumberingTypes( );
+const sal_Int16* pTypes = aTypes.getConstArray();
+for(sal_Int32 nType = 0; nType aTypes.getLength(); nType++)
+{
+sal_Int16 nCurrent = pTypes[nType];
+if(nCurrent NumberingType::CHARS_LOWER_LETTER_N)
+{
+sal_Bool bInsert = sal_True;
+for(sal_uInt16 nEntry = 0; nEntry rFmtLB.GetEntryCount();
nEntry++)
+{
+sal_uInt16 nEntryData =
(sal_uInt16)(sal_uLong)rFmtLB.GetEntryData(nEntry);
+if(nEntryData == (sal_uInt16) nCurrent)
+{
+bInsert = sal_False;
+aRemove[nEntry] = nDontRemove;
+break;
+}
+}
+if(bInsert)
+{
+OUString aIdent = xInfo-getNumberingIdentifier( nCurrent
);
+sal_uInt16 nPos = rFmtLB.InsertEntry(aIdent);
+rFmtLB.SetEntryData(nPos,(void*)(sal_uLong)nCurrent);
+}
+}
+}
+}
+for (size_t i=0; iaRemove.size(); ++i)
+{
+if (aRemove[i] !=
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/dialogs/colorpicker.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 66446668dad9dfb8394fe3e6afcff78662efc63a
Author: Ivan Timofeev timofeev@gmail.com
Date: Mon Oct 22 20:23:18 2012 +0400
fdo#55800: fix hex color conversion
Change-Id: I705ff4c83f635fcfea383a00eec724110d2e4b45
Reviewed-on: https://gerrit.libreoffice.org/895
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index 40f7302..9753a2c 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1407,8 +1407,8 @@ IMPL_LINK( ColorPickerDialog, ColorModifyHdl, void *, p )
if( aColor != GetColor() )
{
mdRed = ((double)aColor.GetRed()) / 255.0;
-mdGreen = ((double)aColor.GetRed()) / 255.0;
-mdBlue = ((double)aColor.GetRed()) / 255.0;
+mdGreen = ((double)aColor.GetGreen()) / 255.0;
+mdBlue = ((double)aColor.GetBlue()) / 255.0;
RGBtoHSV( mdRed, mdGreen, mdBlue, mdHue, mdSat, mdBri );
RGBtoCMYK( mdRed, mdGreen, mdBlue, mdCyan, mdMagenta,
mdYellow, mdKey );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source officecfg/registry svl/inc svl/source unotools/inc unotools/source
cui/source/options/optgdlg.cxx | 128 -
cui/source/options/optgdlg.hrc |3
cui/source/options/optgdlg.hxx |4
cui/source/options/optgdlg.src | 52 +---
officecfg/registry/schema/org/openoffice/Setup.xcs |8 +
svl/inc/svl/zforlist.hxx |4
svl/source/numbers/zforfind.cxx| 55 +++--
svl/source/numbers/zforfind.hxx|2
svl/source/numbers/zforlist.cxx| 37 +++---
unotools/inc/unotools/localedatawrapper.hxx|6
unotools/inc/unotools/syslocaleoptions.hxx | 18 ++
unotools/source/config/syslocaleoptions.cxx| 68 ++-
unotools/source/i18n/localedatawrapper.cxx | 59 +
unotools/source/misc/syslocale.cxx | 31 +
14 files changed, 429 insertions(+), 46 deletions(-)
New commits:
commit cfbfa26deb2776e5c07463e59517eaf68c1d5d6d
Author: Eike Rathke er...@redhat.com
Date: Wed Aug 29 20:49:01 2012 +0200
resolved fdo#52240 fdo#52137 fdo#52288 user editable date patterns
Implemented user editable date acceptance patterns.
The introduction of strict date parsing using locale dependent date
acceptance patterns in 3.6.0 wasn't always welcomed. Besides that not
every locale had patterns for incomplete (only day and month) date
input, users also complained about not being able to key in dates on
numeric keypads if the locale's date separator wasn't '/' or '-'
This commit implements a Date acceptance patterns edit field under
Tools-Options-LanguageSettings-Languages that follows the selected
locale and enables the user to add patterns.
Example de-DE locale:
* default patterns: D.M.Y;D.M.
* to enable additional input on numeric keypad: D.M.Y;D.M.;D-M-Y;D-M
* if 3-4 shall not result in a date, D-M- could be used instead of D-M
* note that to enter an ISO 8601 Y-M-D date with a D-M-Y pattern
active one needs to enter a year 31 or with at least 3 digits, e.g.
011
(cherry picked from commit bf10f4d62a5fe308ea47f9a0aac4f6f7e264ae3e)
Conflicts:
cui/source/options/optgdlg.hrc
svl/source/numbers/zforfind.cxx
unotools/source/config/syslocaleoptions.cxx
Change-Id: Ic1ce91b1f9d29f1837d56b45ba0ae16f6d9cb17c
Reviewed-on: https://gerrit.libreoffice.org/511
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Petr Mladek pmla...@suse.cz
Tested-by: Petr Mladek pmla...@suse.cz
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 72e66d2..8826a09 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1248,6 +1248,22 @@ static OUString
sUserLocalePath(RTL_CONSTASCII_USTRINGPARAM(org.openoffice.Offi
static const OUString sUserLocaleKey(RTL_CONSTASCII_USTRINGPARAM(UILocale));
static Sequence OUString seqInstalledLanguages;
+static OUString lcl_getDatePatternsConfigString( const LocaleDataWrapper
rLocaleWrapper )
+{
+Sequence OUString aDateAcceptancePatterns =
rLocaleWrapper.getDateAcceptancePatterns();
+sal_Int32 nPatterns = aDateAcceptancePatterns.getLength();
+rtl::OUStringBuffer aBuf( nPatterns * 6 ); // 6 := length of Y-M-D;
+SAL_WARN_IF( !nPatterns, cui.options, No date acceptance pattern);
+if (nPatterns)
+{
+const OUString* pPatterns = aDateAcceptancePatterns.getConstArray();
+aBuf.append( pPatterns[0]);
+for (sal_Int32 i=1; i nPatterns; ++i)
+aBuf.append(';').append( pPatterns[i]);
+}
+return aBuf.makeStringAndClear();
+}
+
OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet
rSet ) :
SfxTabPage( pParent, CUI_RES( OFA_TP_LANGUAGES ), rSet ),
aUILanguageGB(this, CUI_RES(FL_UI_LANG )),
@@ -1261,6 +1277,9 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window*
pParent, const SfxItemSet rSe
aDecimalSeparatorCB(this, CUI_RES(CB_DECIMALSEPARATOR)),
aCurrencyFT( this, CUI_RES(FT_CURRENCY )),
aCurrencyLB( this, CUI_RES(LB_CURRENCY )),
+aDatePatternsFI( this, CUI_RES(FI_DATEPATTERNS )),
+aDatePatternsFT( this, CUI_RES(FT_DATEPATTERNS )),
+aDatePatternsED( this, CUI_RES(ED_DATEPATTERNS )),
aLinguLanguageGB(this, CUI_RES(FL_LINGU_LANG )),
aWesternLanguageFI(this,CUI_RES(FI_WEST_LANG )),
aWesternLanguageFT(this,CUI_RES(FT_WEST_LANG )),
@@ -1383,6 +1402,8 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window*
pParent, const SfxItemSet rSe
delete pLanguageTable;
aLocaleSettingLB.SetSelectHdl( LINK( this, OfaLanguagesTabPage,
LocaleSettingHdl ) );
+aDatePatternsED.SetModifyHdl( LINK( this,
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/inc/treeopt.hxx |9 -
cui/source/options/treeopt.cxx | 318 +
2 files changed, 175 insertions(+), 152 deletions(-)
New commits:
commit 10ae81acb68ba6e03cfe8907d8a0a1ea33067376
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Jul 18 14:00:57 2012 +0200
fdo#52232 ConfigurationSet wrapper unusable for localized properties
The comphelper::ConfigurationSet wrapper, used by the automatically
generated
headers to access the configuration data from C++, is based on
com.sun.star.configuration.ReadOnlyAccess/ReadWriteAcess that provide an
all-
locales view of the configuration data, i.e., a localized property is
represented as a UNO object implementing various container interfaces (to
access the per-locale values) instead of a plain value.
Hence,
xLeaveAccess-getByName(C2U(Label)) = sLeafLabel;
silently changed its meaning, now silently failing to extract a string and
leaving sLeafLabel empty, which in turn causes the labels of extension
option
pages to disappear from the Tools - Options... dialog.
This partially reverts commit 161c3f179f71eda2a32dabaf68ff6fb3ba487062 Some
more comphelper/configurationhelper clean up.
Change-Id: I584c682ea6a7c8b9444b34f1867cc553ad160802
(cherry picked from commit aebf5bf22304c73e121b16dc0b51f909c5f34c28)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 38700e6..64d2b9b 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -138,6 +138,7 @@ struct LastPageSaver
// class OfaTreeOptionsDialog
namespace com { namespace sun { namespace star { namespace frame { class
XFrame; } } } }
+namespace com { namespace sun { namespace star { namespace container { class
XNameAccess; } } } }
namespace com { namespace sun { namespace star { namespace lang { class
XMultiServiceFactory; } } } }
namespace com { namespace sun { namespace star { namespace awt { class
XContainerWindowProvider; } } } }
@@ -191,8 +192,12 @@ private:
com::sun::star::lang::XMultiServiceFactory xMFac,
const com::sun::star::uno::Reference
com::sun::star::frame::XFrame
xFrame );
-Module* LoadModule( const rtl::OUString rModuleIdentifier );
-voidLoadNodes( Module* pModule,
+Module* LoadModule( const rtl::OUString rModuleIdentifier,
+const com::sun::star::uno::Reference
+com::sun::star::container::XNameAccess
xRoot );
+voidLoadNodes( const com::sun::star::uno::Reference
+com::sun::star::container::XNameAccess
xRoot,
+ Module* pModule,
const rtl::OUString rExtensionId,
VectorOfNodes rOutNodeList );
voidInsertNodes( const VectorOfNodes rNodeList );
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 95a52c6..66c7b47 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -67,11 +67,11 @@
#include com/sun/star/frame/XModuleManager.hpp
#include com/sun/star/loader/CannotActivateFactoryException.hpp
#include com/sun/star/util/XMacroExpander.hpp
+#include comphelper/configurationhelper.hxx
#include comphelper/processfactory.hxx
#include editeng/optitems.hxx
#include editeng/unolingu.hxx
#include linguistic/misc.hxx
-#include officecfg/Office/OptionsDialog.hxx
#include osl/module.hxx
#include osl/process.h
#include rtl/bootstrap.hxx
@@ -1995,12 +1995,18 @@ void OfaTreeOptionsDialog::LoadExtensionOptions( const
rtl::OUString rExtension
{
Module* pModule = NULL;
Reference XMultiServiceFactory xMSFac =
comphelper::getProcessServiceFactory();
+// open optionsdialog.xcu
+Reference XNameAccess xRoot(
+::comphelper::ConfigurationHelper::openConfig(
+xMSFac, C2U(org.openoffice.Office.OptionsDialog),
+::comphelper::ConfigurationHelper::E_READONLY ), UNO_QUERY );
+DBG_ASSERT( xRoot.is(), OfaTreeOptionsDialog::LoadExtensionOptions(): no
config );
// when called by Tools - Options then load nodes of active module
if ( rExtensionId.isEmpty() )
-pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference XFrame
() ) );
+pModule = LoadModule( GetModuleIdentifier( xMSFac, Reference XFrame
() ), xRoot );
VectorOfNodes aNodeList;
-LoadNodes( pModule, rExtensionId, aNodeList );
+LoadNodes( xRoot, pModule, rExtensionId, aNodeList );
InsertNodes( aNodeList );
}
@@ -2039,58 +2045,64 @@ rtl::OUString OfaTreeOptionsDialog::GetModuleIdentifier(
}
Module*
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/customize/macropg.src |2 +-
cui/source/tabpages/macroass.src |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d5c459afc3532eef70a66835cdcfcd296691adef
Author: Ivan Timofeev timofeev@gmail.com
Date: Sat Jul 14 19:35:32 2012 +0400
fix remaining tab pages
see f70fe6e651eefbc69c434256f7e74ad53519a36c
Change-Id: Ic4cf70997af986dea387b0bdde86ae59ff4be401
Signed-off-by: Fridrich Å trba fridrich.st...@bluewin.ch
diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
index 6de1877..19af3ed 100644
--- a/cui/source/customize/macropg.src
+++ b/cui/source/customize/macropg.src
@@ -40,7 +40,7 @@ TabPage RID_SVXPAGE_MACROASSIGN
Hide = TRUE ;
OutputSize = TRUE ;
SVLook = TRUE ;
-Size = MAP_APPFONT ( WIDTH_TP , HEIGHT_TP ) ;
+Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = Assign action ;
String STR_EVENT
{
diff --git a/cui/source/tabpages/macroass.src b/cui/source/tabpages/macroass.src
index b5269c8..fcfe0aa 100644
--- a/cui/source/tabpages/macroass.src
+++ b/cui/source/tabpages/macroass.src
@@ -36,7 +36,7 @@ TabPage RID_SVXPAGE_EVENTASSIGN
Hide = TRUE ;
SVLook = TRUE ;
DialogControl = TRUE ;
-Size = MAP_APPFONT ( WIDTH_TP , HEIGHT_TP ) ;
+Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Text [ en-US ] = Assign Macro ;
String STR_EVENT
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/dialogs/about.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit ede7e6e18ceb6f48b5e4d2c8a8c770670b1cbf55 Author: Jan Holesovsky ke...@suse.cz Date: Mon Jul 16 14:31:55 2012 +0200 About dialog: Forgot to Show() the image when present. Change-Id: I6a1901e3a47e6e46e84da955872a97e016ce0694 Signed-off-by: Andras Timar ati...@suse.com diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index eff0e6b..65f6bdd 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -226,6 +226,7 @@ void AboutDialog::LayoutControls() aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize ); aLogoImage.SetImage( Image( aLogoBitmap ) ); aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize ); +aLogoImage.Show(); } // Position version text ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source vcl/source
cui/source/dialogs/about.cxx | 21 +
cui/source/dialogs/about.src |3 ---
vcl/source/app/brand.cxx |3 ++-
3 files changed, 15 insertions(+), 12 deletions(-)
New commits:
commit 1d5c3861ba788042eecef7610f58956cdf56cb83
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Jul 13 15:36:28 2012 +0200
Fix the About dialog rendering when librsvg is not available / functional.
Change-Id: Ib460f3cbf44114ef74065168b218daca51f2f0e9
(cherry picked from commit debfb21c927e39ab18aafb1895f343840967e16a)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 21e4592..eff0e6b 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -73,7 +73,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId rId) :
aDescriptionText ( this, ResId( ABOUT_DESCRIPTION_TEXT,
*rId.GetResMgr() ) ),
aCopyrightText ( this, ResId( ABOUT_COPYRIGHT_TEXT,
*rId.GetResMgr() ) ),
aCopyrightTextShadow ( this, ResId( ABOUT_COPYRIGHT_TEXT,
*rId.GetResMgr() ) ),
-aLogoImage ( this, ResId( ABOUT_IMAGE_LOGO, *rId.GetResMgr()
) ),
+aLogoImage ( this ),
aCreditsButton ( this, ResId( ABOUT_BTN_CREDITS,
*rId.GetResMgr() ) ),
aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE,
*rId.GetResMgr() ) ),
aCancelButton( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr()
) ),
@@ -213,15 +213,20 @@ void AboutDialog::LayoutControls()
Size aDialogSize ( aIdealTextWidth + aDialogBorder * 2, 0);
// Render and Position Logo
+Size aLogoSize( aIdealTextWidth, aIdealTextWidth / 20 );
+Point aLogoPos( aDialogBorder, aDialogBorder );
+
vcl::RenderGraphicRasterizer aRasterizerLogo =
Application::LoadBrandSVG(flat_logo);
-float aLogoWidthHeightRatio =
(float)aRasterizerLogo.GetDefaultSizePixel().Width() /
-
(float)aRasterizerLogo.GetDefaultSizePixel().Height();
+if ( !aRasterizerLogo.GetRenderGraphic().IsEmpty()
+ aRasterizerLogo.GetDefaultSizePixel().Width() 0
aRasterizerLogo.GetDefaultSizePixel().Height() 0 )
+{
+const float aLogoWidthHeightRatio =
(float)aRasterizerLogo.GetDefaultSizePixel().Width() /
(float)aRasterizerLogo.GetDefaultSizePixel().Height();
+aLogoSize = Size( aIdealTextWidth, aIdealTextWidth /
aLogoWidthHeightRatio );
-Size aLogoSize( aIdealTextWidth, aIdealTextWidth / aLogoWidthHeightRatio );
-Point aLogoPos( aDialogBorder, aDialogBorder );
-aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
-aLogoImage.SetImage( Image( aLogoBitmap ) );
-aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
+aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
+aLogoImage.SetImage( Image( aLogoBitmap ) );
+aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
+}
// Position version text
sal_Int32 aLogoVersionSpacing = aLogoSize.Height() * 0.15;
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index ab853c6..3793864 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -114,7 +114,4 @@ ModalDialog RID_DEFAULTABOUT
DefButton = TRUE ;
Text [ en-US ] = ~Close;
};
-FixedImage ABOUT_IMAGE_LOGO
-{
-};
};
diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx
index f1c27ac..5113cf0 100644
--- a/vcl/source/app/brand.cxx
+++ b/vcl/source/app/brand.cxx
@@ -122,8 +122,9 @@ vcl::RenderGraphicRasterizer Application::LoadBrandSVG
(const char* pName)
aRasterizer = loadSvg ($BRAND_BASE_DIR/program/edition, aName);
if (!aRasterizer.GetRenderGraphic().IsEmpty())
return aRasterizer;
+
aRasterizer = loadSvg ($BRAND_BASE_DIR/program, aName);
-return aRasterizer;
+return aRasterizer;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source svtools/source svx/inc svx/source
cui/source/options/optgdlg.cxx |6 +++---
svtools/source/misc/langtab.src |1 +
svx/inc/svx/langbox.hxx |1 +
svx/source/dialog/langbox.cxx | 11 +++
4 files changed, 16 insertions(+), 3 deletions(-)
New commits:
commit 860b321d81633268e4b80b8fe10b73df615c28ae
Author: Rob Snelders programm...@ertai.nl
Date: Sun Jul 8 20:51:13 2012 +0200
- fdo#45830 - Language/User Interface: current choice indicated as default
Change-Id: I3ac2e8e3219c12be84ce38cb98342f0dce0d6476
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index b8cc40f..72e66d2 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1355,7 +1355,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window*
pParent, const SfxItemSet rSe
aComplexLanguageLB.InsertDefaultLanguage(
::com::sun::star::i18n::ScriptType::COMPLEX );
aLocaleSettingLB.SetLanguageList( LANG_LIST_ALL |
LANG_LIST_ONLY_KNOWN, sal_False, sal_False, sal_False);
-aLocaleSettingLB.InsertDefaultLanguage(
::com::sun::star::i18n::ScriptType::WEAK );
+aLocaleSettingLB.InsertSystemLanguage( );
const NfCurrencyTable rCurrTab = SvNumberFormatter::GetTheCurrencyTable();
const NfCurrencyEntry rCurr = SvNumberFormatter::GetCurrencyEntry(
LANGUAGE_SYSTEM );
@@ -1697,7 +1697,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet rSet )
if ( !sLang.isEmpty() )
aLocaleSettingLB.SelectLanguage(lcl_LangStringToLangType(sLang));
else
-aLocaleSettingLB.SelectLanguage( LANGUAGE_SYSTEM );
+aLocaleSettingLB.SelectLanguage( LANGUAGE_USER_SYSTEM_CONFIG );
sal_Bool bReadonly =
pLangConfig-aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_LOCALE);
aLocaleSettingLB.Enable(!bReadonly);
aLocaleSettingFT.Enable(!bReadonly);
@@ -1904,7 +1904,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl,
SvxLanguageBox*, pBox )
}
sal_uInt16 nPos;
-if ( eLang == LANGUAGE_SYSTEM )
+if ( eLang == LANGUAGE_USER_SYSTEM_CONFIG )
nPos = aCurrencyLB.GetEntryPos( (void*) NULL );
else
{
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 6ddac9e..5ac0a0d 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -41,6 +41,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
[None] ; LANGUAGE_NONE ; ;
Unknown ; LANGUAGE_DONTKNOW ; ;
Default ; LANGUAGE_SYSTEM ; ;
+ Default ; LANGUAGE_USER_SYSTEM_CONFIG ; ;
Afrikaans (South Africa) ; LANGUAGE_AFRIKAANS ; ;
Albanian ; LANGUAGE_ALBANIAN ; ;
Arabic ; LANGUAGE_ARABIC_PRIMARY_ONLY ; ;
diff --git a/svx/inc/svx/langbox.hxx b/svx/inc/svx/langbox.hxx
index 7baf253..37a7699 100644
--- a/svx/inc/svx/langbox.hxx
+++ b/svx/inc/svx/langbox.hxx
@@ -89,6 +89,7 @@ public:
sal_uInt16 InsertLanguage( const LanguageType eLangType,
sal_uInt16 nPos = LISTBOX_APPEND );
sal_uInt16 InsertDefaultLanguage( sal_Int16 nType, sal_uInt16
nPos = LISTBOX_APPEND );
+sal_uInt16 InsertSystemLanguage( sal_uInt16 nPos = LISTBOX_APPEND
);
sal_uInt16 InsertLanguage( const LanguageType eLangType,
sal_Bool bCheckEntry, sal_uInt16 nPos =
LISTBOX_APPEND );
voidRemoveLanguage( const LanguageType eLangType );
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 0ec2329..ff08724 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -352,6 +352,10 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const
LanguageType nLangType, sal
nRealLang = MsLangId::resolveSystemLanguageByScriptType(nRealLang,
nType);
aStrEntry.AppendAscii( - );
aStrEntry.Append(m_pLangTable-GetString( nRealLang ));
+} else if (nRealLang == LANGUAGE_USER_SYSTEM_CONFIG) {
+nRealLang = MsLangId::getSystemLanguage();
+aStrEntry.AppendAscii( - );
+aStrEntry.Append(m_pLangTable-GetString( nRealLang ));
}
aStrEntry = ApplyLreOrRleEmbedding( aStrEntry );
@@ -388,6 +392,13 @@ sal_uInt16 SvxLanguageBox::InsertDefaultLanguage(
sal_Int16 nType, sal_uInt16 nP
//
+sal_uInt16 SvxLanguageBox::InsertSystemLanguage( sal_uInt16 nPos )
+{
+return ImplInsertLanguage( LANGUAGE_USER_SYSTEM_CONFIG, nPos,
::com::sun::star::i18n::ScriptType::WEAK );
+}
+
+//
+
sal_uInt16 SvxLanguageBox::InsertLanguage( const LanguageType nLangType,
sal_Bool bCheckEntry, sal_uInt16 nPos )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source svtools/inc svtools/source
cui/source/dialogs/svuidlg.hrc|1
cui/source/dialogs/svuidlg.src|6 ---
svtools/inc/svtools/sores.hxx | 17 --
svtools/source/dialogs/so3res.src | 64 --
4 files changed, 88 deletions(-)
New commits:
commit f928812588e3cf6584a345fafd7b05e1b4f076ca
Author: Andras Timar ati...@suse.com
Date: Sat Jun 30 08:50:05 2012 +0200
remove unused string resources
Change-Id: Ie764adf7a602e9335e6da1de94d6f737feea6364
diff --git a/cui/source/dialogs/svuidlg.hrc b/cui/source/dialogs/svuidlg.hrc
index 8add126..a6e9ed7 100644
--- a/cui/source/dialogs/svuidlg.hrc
+++ b/cui/source/dialogs/svuidlg.hrc
@@ -43,7 +43,6 @@
#define STR_CLOSELINKMSG32011
#define STR_CLOSELINKMSG_MULTI 32024
#define STR_WAITINGLINK 32028
-#define STR_EDIT_APPLET 32029
#define FL_CHOICE 15
diff --git a/cui/source/dialogs/svuidlg.src b/cui/source/dialogs/svuidlg.src
index 7fe0fc8..88f8de0 100644
--- a/cui/source/dialogs/svuidlg.src
+++ b/cui/source/dialogs/svuidlg.src
@@ -733,9 +733,3 @@ String MD_INSERT_OBJECT_IFRAME
{
Text [ en-US ] = Select File for Floating Frame ;
};
-
-String STR_EDIT_APPLET
-{
-Text [ en-US ] = Edit Applet ;
-};
-
diff --git a/svtools/inc/svtools/sores.hxx b/svtools/inc/svtools/sores.hxx
index 1b19a2c..5ec6dc6 100644
--- a/svtools/inc/svtools/sores.hxx
+++ b/svtools/inc/svtools/sores.hxx
@@ -27,27 +27,10 @@
/
// Strings
-#define STR_INS_OBJECT 32000
-#define STR_INS_OBJECT_ICON 32001
-#define STR_INS_FILE32002
-#define STR_INS_FILE_ICON 32003
-#define STR_INS_FILE_LINK 32004
-#define STR_INS_FILE_ICON_LINK 32005
-#define STR_PASTE 32012
-#define STR_ERROR_DDE 32013
#define STR_ERROR_OBJNOCREATE 32014
#define STR_ERROR_OBJNOCREATE_FROM_FILE 32015
-#define STR_VERB_OPEN 32016
-#define STR_PLUGIN_CANT_SHOW32017
#define STR_ERROR_OBJNOCREATE_PLUGIN32018
-#define STR_INS_PLUGIN 32019
-#define STR_CONVERT_TO 32010
-#define STR_ACTIVATE_AS 32021
-#define STR_QUERYUPDATELINKS32022
-#define STR_INS_APPLET 32023
-#define STR_VERB_PROPS 32025
#define STR_FURTHER_OBJECT 32026
-#define STR_EDIT_APPLET 32029
#define STR_UNKNOWN_SOURCE 32027
#define BMP_PLUGIN 32000
diff --git a/svtools/source/dialogs/so3res.src
b/svtools/source/dialogs/so3res.src
index 3b2aab3..4f43813 100644
--- a/svtools/source/dialogs/so3res.src
+++ b/svtools/source/dialogs/so3res.src
@@ -182,66 +182,10 @@ Resource RID_SO_ERRCTX
Text [ en-US ] = $(ERR) activating object ;
};
};
-String STR_INS_OBJECT
-{
-Text [ en-US ] = Inserts a new %1-Object into your document. ;
-};
-String STR_INS_OBJECT_ICON
-{
-Text [ en-US ] = Inserts a new %1-Object into your document as a symbol.
;
-};
-String STR_INS_FILE
-{
-Text [ en-US ] = Inserts the contents of the file into your document to
enable later editing in the original application. ;
-};
-String STR_INS_PLUGIN
-{
-Text [ en-US ] = Inserts a plug-in object into your document with a
reference to the plug-in data. When the object is activated, the plug-in is
automatically executed. ;
-};
String STR_INS_APPLET
{
Text [ en-US ] = Inserts an applet object into your document. When the
object is activated, the applet is automatically executed. ;
};
-String STR_INS_FILE_ICON
-{
-Text [ en-US ] = Inserts the contents of the file as an icon into your
document. ;
-};
-String STR_INS_FILE_LINK
-{
-Text [ en-US ] = Inserts the contents of the file into your document and
creates a link to the source file. Changes made to the source file will be
reflected in your document. ;
-};
-String STR_INS_FILE_ICON_LINK
-{
-Text [ en-US ] = Inserts an icon into your document representing the
file. Changes made to the source file will be reflected in your document. ;
-};
-String STR_PASTE
-{
-Text [ en-US ] = Pastes the contents of the clipboard as %1 in your
document. ;
-};
-String STR_CONVERT_TO
-{
-Text [ en-US ] = Converts the selected %1object to the object type %2. ;
-};
-String STR_ACTIVATE_AS
-{
-Text [ en-US ] = All objects of type %1 are activated as %2, but not
converted ;
-};
-String STR_VERB_OPEN
-{
-Text [ en-US ] = ~Open ;
-};
-String STR_VERB_PROPS
-{
-Text [ en-US ] = ~Properties ;
-};
-String STR_PLUGIN_CANT_SHOW
-{
-Text [ en-US ] = Plug-in % cannot be displayed. ;
-};
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/dialogs/about.src |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b20a723a6915ba1d8a8ca908bf27182ce577557f
Author: Robinson Tryon qu...@runcibility.com
Date: Thu Jun 21 13:01:34 2012 -0400
fdo#43180: Use hyphen for copyright range in About box
A range of years is more clearly delineated with a hyphen than with a
comma.
Change-Id: I36a668b7e6ccecc210daa69de7948ad5c029f96d
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 21fb624..3a38862 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -83,7 +83,7 @@ ModalDialog RID_DEFAULTABOUT
};
String ABOUT_STR_COPYRIGHT
{
-Text[ en-US ] = Copyright © 2000, 2012 LibreOffice contributors
and/or their affiliates;
+Text[ en-US ] = Copyright © 2000 - 2012 LibreOffice contributors
and/or their affiliates;
};
String ABOUT_STR_BASED
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source officecfg/registry sfx2/source svtools/inc svtools/source
cui/source/options/optgdlg.cxx | 18 +-
cui/source/options/optgdlg.hrc |3 +
cui/source/options/optgdlg.hxx |1
cui/source/options/optgdlg.src |6 ++
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 10 +++
sfx2/source/view/viewfrm.cxx |4 -
svtools/inc/svtools/miscopt.hxx|3 +
svtools/source/config/miscopt.cxx | 34 -
8 files changed, 72 insertions(+), 7 deletions(-)
New commits:
commit 3c904d64f4e160d2feade4b05c5115d2db8f37f6
Author: Cor Nouws oo...@nouenoff.nl
Date: Sun Jun 10 23:00:36 2012 +0200
Give Macro recorder separate option, apart from Experimental features
Change-Id: I9dbf5d510ebaff8448a152d75a006a183303bd81
(cherry picked from commit 5ae11320a26a6356dfadeb812e0d6baf5bdc951c)
Signed-off-by: Caolán McNamara caol...@redhat.com
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 762ec3d..b8cc40f 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -215,7 +215,8 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const
SfxItemSet rSet ) :
aInterpretFT( this, CUI_RES( FT_INTERPRET ) ),
aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ),
aToYearFT ( this, CUI_RES( FT_TOYEAR ) ),
-aExperimentalCB ( this, CUI_RES( CB_EXPERIMENTAL ) )
+aExperimentalCB ( this, CUI_RES( CB_EXPERIMENTAL ) ),
+aMacroRecorderCB( this, CUI_RES( CB_MACRORECORDER ) )
{
FreeResource();
@@ -250,7 +251,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const
SfxItemSet rSet ) :
Window* pWins[] =
{
aPrintDlgFL, aPrintDlgCB, aDocStatusFL, aDocStatusCB,
aSaveAlwaysCB,
-aTwoFigureFL, aInterpretFT, aYearValueField, aToYearFT,
aExperimentalCB
+aTwoFigureFL, aInterpretFT, aYearValueField, aToYearFT,
aExperimentalCB, aMacroRecorderCB
};
Window** pCurrent = pWins;
const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
@@ -271,7 +272,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const
SfxItemSet rSet ) :
Window* pWins[] =
{
aPrintDlgFL, aPrintDlgCB, aDocStatusFL, aDocStatusCB,
aSaveAlwaysCB,
-aTwoFigureFL, aInterpretFT, aYearValueField, aToYearFT,
aExperimentalCB
+aTwoFigureFL, aInterpretFT, aYearValueField, aToYearFT,
aExperimentalCB, aMacroRecorderCB
};
Window** pCurrent = pWins;
const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
@@ -297,7 +298,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const
SfxItemSet rSet ) :
Window* pWins[] =
{
aDocStatusFL, aDocStatusCB, aSaveAlwaysCB, aTwoFigureFL,
-aInterpretFT, aYearValueField, aToYearFT, aExperimentalCB
+aInterpretFT, aYearValueField, aToYearFT, aExperimentalCB,
aMacroRecorderCB
};
Window** pCurrent = pWins;
const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
@@ -441,6 +442,13 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet rSet )
bModified = sal_True;
}
+if ( aMacroRecorderCB.IsChecked() != aMacroRecorderCB.GetSavedValue() )
+{
+SvtMiscOptions aMiscOpt;
+aMiscOpt.SetMacroRecorderMode( aMacroRecorderCB.IsChecked() );
+bModified = sal_True;
+}
+
const SfxUInt16Item* pUInt16Item =
PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) );
sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().ToInt32();
@@ -486,6 +494,8 @@ void OfaMiscTabPage::Reset( const SfxItemSet rSet )
aSaveAlwaysCB.SaveValue();
aExperimentalCB.Check( aMiscOpt.IsExperimentalMode() );
aExperimentalCB.SaveValue();
+aMacroRecorderCB.Check( aMiscOpt.IsMacroRecorderMode() );
+aMacroRecorderCB.SaveValue();
aODMADlgCB.Check( aMiscOpt.TryODMADialog() );
aODMADlgCB.SaveValue();
diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index d870e29..2ccc503 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -65,6 +65,7 @@
#define ROW12 (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
#define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
#define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE+6)
+#define ROW15 (ROW14+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
#define DIFF(v1,v2) (v2-v1)
#define OFFS_TEXTBOX_FIXEDTEXT(base)
(base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
@@ -112,6 +113,8 @@
#define LB_HELPFORMAT 16
#define FT_EXPERIMENTAL 17
#define CB_EXPERIMENTAL 18
+#define FT_MACRORECORDER19
+#define CB_MACRORECORDER20
//#define FL_FILEDLG
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/dialogs/about.cxx |2 +- cui/source/inc/about.hxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit dc9b1d2a3e8cd4b26f83688ee6f6cc740bee2d74 Author: Andras Timar ati...@suse.com Date: Wed Jun 13 22:45:06 2012 +0200 fdo#51046 fix tab order in About box Change-Id: Ib15db39659faae398ae3d33f01886c43c0a3b507 diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index c0df238..ddf296f 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -75,8 +75,8 @@ AboutDialog::AboutDialog( Window* pParent, const ResId rId) : aCopyrightTextShadow ( this, ResId( ABOUT_COPYRIGHT_TEXT, *rId.GetResMgr() ) ), aLogoImage ( this, ResId( ABOUT_IMAGE_LOGO, *rId.GetResMgr() ) ), aCreditsButton ( this, ResId( ABOUT_BTN_CREDITS, *rId.GetResMgr() ) ), -aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ), aLicenseButton ( this, ResId( ABOUT_BTN_LICENSE, *rId.GetResMgr() ) ), +aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ), aCancelButton( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr() ) ), m_aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr()).toString().trim()), m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())), diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index fb876a5..7fa29cd 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -52,8 +52,8 @@ private: MultiLineEdit aCopyrightTextShadow; FixedImage aLogoImage; PushButton aCreditsButton; -PushButton aWebsiteButton; PushButton aLicenseButton; +PushButton aWebsiteButton; CancelButtonaCancelButton; String aVersionData; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source
cui/source/tabpages/numpages.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 9277c7320406b4737bd71564e341464676c66e31
Author: Stephan van den Akker stephanv...@gmail.com
Date: Thu Jun 7 09:21:17 2012 +0200
Fix for fdo#49859 Impress bullet indent data entry
This fixes fdo#49859 - numbering alignment or indentation is not
applied in Impress, by making the tabpage deactivate force-read
the values.
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index fc05d72..63e4ae4 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -3007,7 +3007,12 @@ void SvxNumPositionTabPage::ActivatePage(const
SfxItemSet rSet)
int SvxNumPositionTabPage::DeactivatePage(SfxItemSet *_pSet)
{
if(_pSet)
+{
+if(aDistBorderMF.IsEnabled())
+DistanceHdl_Impl(aDistBorderMF);
+DistanceHdl_Impl(aIndentMF);
FillItemSet(*_pSet);
+}
return sal_True;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-6' - cui/source sw/source
cui/source/dialogs/postdlg.src |6 +++---
sw/source/ui/inc/shells.hrc |1 -
sw/source/ui/ribbar/workctrl.src |6 +++---
sw/source/ui/shells/shells.src |4
4 files changed, 6 insertions(+), 11 deletions(-)
New commits:
commit 5e945f4009769e6349e2b00959803b1e2e94391e
Author: Andras Timar ati...@suse.com
Date: Thu Jun 7 09:29:03 2012 +0200
fdo#50809 use the word 'Comment' instead of 'Note' everywhere
Change-Id: Ia42060d415516a1ba8e23f913875786fe27c9710
diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src
index 9b65235..33d5871 100644
--- a/cui/source/dialogs/postdlg.src
+++ b/cui/source/dialogs/postdlg.src
@@ -37,7 +37,7 @@ ModalDialog RID_SVXDLG_POSTIT
OutputSize = TRUE ;
SvLook = TRUE ;
Size = MAP_APPFONT ( 198 , 134 ) ;
-Text [ en-US ] = Note ;
+Text [ en-US ] = Comment ;
Moveable = TRUE ;
FixedText FT_LASTEDITLABEL
{
@@ -122,11 +122,11 @@ ModalDialog RID_SVXDLG_POSTIT
// lokale Strings
String STR_NOTIZ_EDIT
{
-Text [ en-US ] = Edit Note ;
+Text [ en-US ] = Edit Comment ;
};
String STR_NOTIZ_INSERT
{
-Text [ en-US ] = Insert note ;
+Text [ en-US ] = Insert Comment ;
};
};
// ** EOF
diff --git a/sw/source/ui/inc/shells.hrc b/sw/source/ui/inc/shells.hrc
index 6c3e409..0c96219 100644
--- a/sw/source/ui/inc/shells.hrc
+++ b/sw/source/ui/inc/shells.hrc
@@ -37,7 +37,6 @@
#define STR_GRFILTER_FILTERERROR (RC_SHELLS_BEGIN + 5)
#define STR_GRFILTER_TOOBIG(RC_SHELLS_BEGIN + 6)
#define STR_INSERT_GRAPHIC (RC_SHELLS_BEGIN + 7)
-#define STR_NOTIZ_INSERT (RC_SHELLS_BEGIN + 8)
#define DLG_IMPORT_DBNAME (RC_SHELLS_BEGIN + 9)
#define STR_NO_ADDRESSBOOK (RC_SHELLS_BEGIN + 10)
#define STR_REDLINE_COMMENT(RC_SHELLS_BEGIN + 11)
diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src
index 6aac347..615f35f 100644
--- a/sw/source/ui/ribbar/workctrl.src
+++ b/sw/source/ui/ribbar/workctrl.src
@@ -197,7 +197,7 @@ FloatingWindow RID_SCROLL_NAVIGATION_WIN
};
String ST_POSTIT
{
-Text [ en-US ] = Note ;
+Text [ en-US ] = Comment ;
};
String ST_SRCH_REP
{
@@ -282,7 +282,7 @@ String STR_IMGBTN_MARK_DOWN
};
String STR_IMGBTN_POSTIT_DOWN
{
-Text [ en-US ] = Next Note ;
+Text [ en-US ] = Next Comment ;
};
String STR_IMGBTN_SRCH_REP_DOWN
{
@@ -354,7 +354,7 @@ String STR_IMGBTN_MARK_UP
};
String STR_IMGBTN_POSTIT_UP
{
-Text [ en-US ] = Previous Note ;
+Text [ en-US ] = Previous Comment ;
};
String STR_IMGBTN_SRCH_REP_UP
{
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index ee1f6ec..ff8e093 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -66,10 +66,6 @@ String STR_NO_ADDRESSBOOK
{
Text [ en-US ] = An Address Book does not exist ;
};
-String STR_NOTIZ_INSERT
-{
-Text [ en-US ] = Insert Note ;
-};
String STR_REDLINE_COMMENT
{
Text [ en-US ] = Comment: ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
