[ABANDONED] Sidebar conversion to .ui for sidebar_page_property
Jan Holesovsky has abandoned this change. Change subject: Sidebar conversion to .ui for sidebar_page_property .. Patch Set 1: Abandoned Abandoning this one; by mistake I changed the change-id when I was committing the change :-) Thank you again, it is now integrated as: http://cgit.freedesktop.org/libreoffice/core/commit/?id=0813006e76880e78200cad47baefb5b70d9b21e8 -- To view, visit https://gerrit.libreoffice.org/4298 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I6ffc36fa8d3c6656392354864092f6cbc7e3c30d Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Prashant Pandey prashant3.yi...@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] sidebar: Conversion to .ui for CellAppearancePropertyPanel
Jan Holesovsky has uploaded a new patch set (#4). Change subject: sidebar: Conversion to .ui for CellAppearancePropertyPanel .. sidebar: Conversion to .ui for CellAppearancePropertyPanel Change-Id: I90df6ebe428ec201aa204f26447c1728b2120c69 --- M sc/UIConfig_scalc.mk M sc/inc/sc.hrc M sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx M sc/source/ui/sidebar/CellAppearancePropertyPanel.hrc M sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx M sc/source/ui/sidebar/CellAppearancePropertyPanel.src A sc/uiconfig/scalc/ui/sidebarcellappearance.ui 7 files changed, 337 insertions(+), 319 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/27/4227/4 -- To view, visit https://gerrit.libreoffice.org/4227 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I90df6ebe428ec201aa204f26447c1728b2120c69 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Prashant Pandey prashant3.yi...@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Prashant Pandey prashant3.yi...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Reduce the amount of calls of mkdir -p.
Hi, I have submitted a patch for review: https://gerrit.libreoffice.org/4297 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/4297/1 Reduce the amount of calls of mkdir -p. Change-Id: Ib4762f5a260035f00b5e68cf45b687fdf02e9c02 --- M solenv/gbuild/LinkTarget.mk M solenv/gbuild/SdiTarget.mk M solenv/gbuild/UnoApiTarget.mk 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index ef79709..63f0f11 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -102,7 +102,6 @@ # It is used on first build and in case the user deletes the object dep file. ifeq ($(gb_FULLDEPS),$(true)) define gb_Object__command_dep -mkdir -p $(dir $(1)) \ echo $(2) : $(gb_Helper_PHONY) $(1) endef @@ -184,6 +183,12 @@ endif ifeq ($(gb_FULLDEPS),$(true)) +$(dir $(call gb_CxxObject_get_dep_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(dir $(call gb_CxxObject_get_dep_target,%))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + $(call gb_CxxObject_get_dep_target,%) : $(if $(wildcard $@),touch $@,\ $(eval $(gb_CxxObject__set_pchflags))\ @@ -919,6 +924,7 @@ ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS += $(2) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CObject_get_dep_target,$(2)) +$(call gb_CObject_get_dep_target,$(2)) :| $(dir $(call gb_CObject_get_dep_target,$(2))).dir endif endef @@ -940,6 +946,7 @@ ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS += $(2) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_CxxObject_get_dep_target,$(2)) +$(call gb_CxxObject_get_dep_target,$(2)) :| $(dir $(call gb_CxxObject_get_dep_target,$(2))).dir endif endef @@ -1015,6 +1022,7 @@ ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS += $(2) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenCObject_get_dep_target,$(2)) +$(call gb_GenCObject_get_dep_target,$(2)) :| $(dir $(call gb_GenCObject_get_dep_target,$(2))).dir endif endef @@ -1041,6 +1049,7 @@ ifeq ($(gb_FULLDEPS),$(true)) $(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2) $(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_GenCxxObject_get_dep_target,$(2)) +$(call gb_GenCxxObject_get_dep_target,$(2)) :| $(dir $(call gb_GenCxxObject_get_dep_target,$(2))).dir endif endef diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk index 2fbe2e7..c4cf2ed 100644 --- a/solenv/gbuild/SdiTarget.mk +++ b/solenv/gbuild/SdiTarget.mk @@ -28,7 +28,7 @@ $(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS) $(call gb_Output_announce,$*,$(true),SDI,1) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $@) $(dir $(call gb_SdiTarget_get_dep_target,$*))) + mkdir -p $(dir $@)) $(call gb_Helper_abbreviate_dirs,\ cd $(dir $) \ $(gb_SdiTarget_SVIDLCOMMAND) -quiet \ @@ -47,6 +47,12 @@ @true ifeq ($(gb_FULLDEPS),$(true)) +$(dir $(call gb_SdiObject_get_dep_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(dir $(call gb_SdiObject_get_dep_target,%))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + $(call gb_SdiTarget_get_dep_target,%) : $(if $(wildcard $@),touch $@,\ $(call gb_Object__command_dep,$@,$(call gb_SdiTarget_get_target,$*))) @@ -66,6 +72,7 @@ $(call gb_SdiTarget_get_target,$(1)) : EXPORTS := $(SRCDIR)/$(2).sdi ifeq ($(gb_FULLDEPS),$(true)) -include $(call gb_SdiTarget_get_dep_target,$(1)) +$(call gb_SdiTarget_get_dep_target,$(1)) :| $(dir $(call gb_SdiTarget_get_dep_target,$(1))).dir endif endef diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 703d6b1..45096b3 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -65,6 +65,11 @@ $(call gb_UnoApiPartTarget__command,$@,$*,$(filter-out $(gb_UnoApiPartTarget_IDLCDEPS),$(if $(filter $(gb_UnoApiPartTarget_IDLCDEPS),$?),$^,$?))) ifeq ($(gb_FULLDEPS),$(true)) +$(dir $(call gb_UnoApiPartTarget_get_dep_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(dir $(call gb_UnoApiPartTarget_get_dep_target,%))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_UnoApiPartTarget_get_dep_target,%) : $(if $(wildcard $@),touch $@,\ @@ -137,6 +142,11 @@ endef ifeq ($(gb_FULLDEPS),$(true)) +$(dir $(call gb_UnoApiTarget_get_dep_target,%)).dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) + +$(dir $(call gb_UnoApiTarget_get_dep_target,%))%/.dir : + $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) $(call gb_UnoApiTarget_get_dep_target,%) : $(call gb_Executable_get_runtime_dependencies,concat-deps) $(call
[PUSHED] sidebar: Conversion to .ui for NumberFormatPropertyPanel
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4176 -- To view, visit https://gerrit.libreoffice.org/4176 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25891c0acda620621f0af868914cbc58776d0f53 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Prashant Pandey prashant3.yi...@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#63323 fix the comment position when the mouse over cell
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4069 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4069 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b38a840fb17a70e1ba60d46b8c83b7e498501e1 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Faisal al-otaibi fmalota...@kacst.edu.sa Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#64451 Add Find All to the Find bar.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/4016 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/4016 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7a5f2881d2aa77f2d5c6c302c8eac1162b194bcf Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Andrzej J.R. Hunt andr...@ahunt.org Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED] Show only filename in Recent Files list on Start Center
Jan Holesovsky has abandoned this change. Change subject: Show only filename in Recent Files list on Start Center .. Patch Set 1: Abandoned Oh, so this one was (in the meantime) invalidated by: http://cgit.freedesktop.org/libreoffice/core/commit/?id=174e32567f410e9049e9856629896ae6a798d752 -- To view, visit https://gerrit.libreoffice.org/4027 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I57f7564aae035ce158b819ca1495a547754a95f8 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Prashant Pandey prashant3.yi...@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#61092: force ENABLE_QUICKSTART_LIBPNG to None with --ena...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3802 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3802 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia16b38ae61f485ba62cd2b802a2e1239697be088 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] configure: with --enable-headless disable opengl by default
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3803 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3803 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I28bd271ca1121070a331cd0a9b1d1ce823ce7c63 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Riccardo Magliocchetti riccardo.magliocche...@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED libreoffice-4-0] fdo#64211 replace / to %2F in HIDs for wiki redirects
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3811 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3811 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93780b76e17a3b833ef4ee6a50bb0969ab8bb01c Gerrit-PatchSet: 2 Gerrit-Project: help Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Show only filename in Recent Files list
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3700 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3700 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47472c901aa866adb76c7c7ab36bc871f82ad8df Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0-3] fdo#59259: Suppress the expensive parts when we are only wri...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3597
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/97/3597/1
fdo#59259: Suppress the expensive parts when we are only writing to metafile.
When we are launching the printing dialog, we first draw the page using
drawinglayer to a metafile, and then render the metafile. Unfortunately, here
we did the real operation of allocating large bitmaps, and destroying them
again; all that just to throw all that away at the end of the operation.
The preview sets the mbOutput to false correctly, so we can just skip the
expensive parts.
Change-Id: Ice77d83100eba339602bbdf374fec8546d4d1e12
---
M vcl/source/gdi/outdev6.cxx
1 file changed, 3 insertions(+), 0 deletions(-)
diff --git a/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 46eb689..85f6ce5 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.cxx
@@ -614,6 +614,9 @@
if( mpMetaFile )
mpMetaFile-AddAction( new MetaFloatTransparentAction( rMtf, rPos,
rSize, rTransparenceGradient ) );
+if ( !IsDeviceOutputNecessary() )
+return;
+
if( ( rTransparenceGradient.GetStartColor() == aBlack
rTransparenceGradient.GetEndColor() == aBlack ) ||
( mnDrawMode ( DRAWMODE_NOTRANSPARENCY ) ) )
{
--
To view, visit https://gerrit.libreoffice.org/3597
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice77d83100eba339602bbdf374fec8546d4d1e12
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-3
Gerrit-Owner: Jan Holesovsky ke...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Personas: Now they are called 'Themes', and changed location...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3482
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/3482/1
Personas: Now they are called 'Themes', and changed location.
Updated the URL's + the code that works with them parses the page
accordingly.
Change-Id: Iba1414c749bdf227b3945162da83e3d35ce86244
---
M cui/source/options/personalization.cxx
1 file changed, 12 insertions(+), 22 deletions(-)
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 10ee48b..0878db4 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -33,7 +33,7 @@
/** Dialog that will allow the user to choose a Persona to use.
So far there is no better possibility than just to paste the URL from
-http://www.getpersona.com ...
+https://addons.mozilla.org/firefox/themes ...
*/
class SelectPersonaDialog : public ModalDialog
{
@@ -59,34 +59,24 @@
pButton-SetClickHdl( LINK( this, SelectPersonaDialog, VisitPersonas ) );
get( m_pEdit, persona_url );
-m_pEdit-SetPlaceholderText( http://www.getpersonas.com/persona/; );
+m_pEdit-SetPlaceholderText( https://addons.mozilla.org/firefox/themes/;
);
}
OUString SelectPersonaDialog::GetPersonaURL() const
{
OUString aText( m_pEdit-GetText() );
-if ( !aText.startsWith( http://www.getpersonas.com/; )
- !aText.startsWith( https://www.getpersonas.com/; ) )
-{
-return OUString();
-}
+if ( aText.startsWith( https://addons.mozilla.org/; ) )
+return aText;
-// canonicalize the URL
-OUString aPersona( persona/ );
-sal_Int32 nPersona = aText.lastIndexOf( aPersona );
-
-if ( nPersona 0 )
-return OUString();
-
-return http://www.getpersonas.com/persona/; + aText.copy( nPersona +
aPersona.getLength() );
+return OUString();
}
IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, /*pButton*/ )
{
uno::Reference com::sun::star::system::XSystemShellExecute
xSystemShell( com::sun::star::system::SystemShellExecute::create(
::comphelper::getProcessComponentContext() ) );
-xSystemShell-execute( http://www.getpersonas.com;, OUString(),
com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
+xSystemShell-execute( https://addons.mozilla.org/firefox/themes/;,
OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
return 0;
}
@@ -291,7 +281,7 @@
where += rIdentifier.getLength();
-sal_Int32 end = rBuffer.indexOf( quot;, where );
+sal_Int32 end = rBuffer.indexOf( #34;, where );
if ( end 0 )
return OUString();
@@ -305,24 +295,24 @@
static bool parsePersonaInfo( const OString rBuffer, OUString *pHeaderURL,
OUString *pFooterURL, OUString *pTextColor, OUString *pAccentColor )
{
// it is the first attribute that contains persona=
-sal_Int32 persona = rBuffer.indexOf( persona=\{ );
+sal_Int32 persona = rBuffer.indexOf( data-browsertheme=\{ );
if ( persona 0 )
return false;
// now search inside
-*pHeaderURL = searchValue( rBuffer, persona,
quot;headerURLquot;:quot; );
+*pHeaderURL = searchValue( rBuffer, persona, #34;headerURL#34;:#34; );
if ( pHeaderURL-isEmpty() )
return false;
-*pFooterURL = searchValue( rBuffer, persona,
quot;footerURLquot;:quot; );
+*pFooterURL = searchValue( rBuffer, persona, #34;footerURL#34;:#34; );
if ( pFooterURL-isEmpty() )
return false;
-*pTextColor = searchValue( rBuffer, persona,
quot;textcolorquot;:quot; );
+*pTextColor = searchValue( rBuffer, persona, #34;textcolor#34;:#34; );
if ( pTextColor-isEmpty() )
return false;
-*pAccentColor = searchValue( rBuffer, persona,
quot;accentcolorquot;:quot; );
+*pAccentColor = searchValue( rBuffer, persona,
#34;accentcolor#34;:#34; );
if ( pAccentColor-isEmpty() )
return false;
--
To view, visit https://gerrit.libreoffice.org/3482
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba1414c749bdf227b3945162da83e3d35ce86244
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jan Holesovsky ke...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0-3] Personas: Now they are called 'Themes', and changed location...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3483
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/83/3483/1
Personas: Now they are called 'Themes', and changed location.
Updated the URL's + the code that works with them parses the page
accordingly.
Change-Id: Iba1414c749bdf227b3945162da83e3d35ce86244
---
M cui/source/options/personalization.cxx
1 file changed, 12 insertions(+), 22 deletions(-)
diff --git a/cui/source/options/personalization.cxx
b/cui/source/options/personalization.cxx
index 10ee48b..0878db4 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -33,7 +33,7 @@
/** Dialog that will allow the user to choose a Persona to use.
So far there is no better possibility than just to paste the URL from
-http://www.getpersona.com ...
+https://addons.mozilla.org/firefox/themes ...
*/
class SelectPersonaDialog : public ModalDialog
{
@@ -59,34 +59,24 @@
pButton-SetClickHdl( LINK( this, SelectPersonaDialog, VisitPersonas ) );
get( m_pEdit, persona_url );
-m_pEdit-SetPlaceholderText( http://www.getpersonas.com/persona/; );
+m_pEdit-SetPlaceholderText( https://addons.mozilla.org/firefox/themes/;
);
}
OUString SelectPersonaDialog::GetPersonaURL() const
{
OUString aText( m_pEdit-GetText() );
-if ( !aText.startsWith( http://www.getpersonas.com/; )
- !aText.startsWith( https://www.getpersonas.com/; ) )
-{
-return OUString();
-}
+if ( aText.startsWith( https://addons.mozilla.org/; ) )
+return aText;
-// canonicalize the URL
-OUString aPersona( persona/ );
-sal_Int32 nPersona = aText.lastIndexOf( aPersona );
-
-if ( nPersona 0 )
-return OUString();
-
-return http://www.getpersonas.com/persona/; + aText.copy( nPersona +
aPersona.getLength() );
+return OUString();
}
IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, /*pButton*/ )
{
uno::Reference com::sun::star::system::XSystemShellExecute
xSystemShell( com::sun::star::system::SystemShellExecute::create(
::comphelper::getProcessComponentContext() ) );
-xSystemShell-execute( http://www.getpersonas.com;, OUString(),
com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
+xSystemShell-execute( https://addons.mozilla.org/firefox/themes/;,
OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
return 0;
}
@@ -291,7 +281,7 @@
where += rIdentifier.getLength();
-sal_Int32 end = rBuffer.indexOf( quot;, where );
+sal_Int32 end = rBuffer.indexOf( #34;, where );
if ( end 0 )
return OUString();
@@ -305,24 +295,24 @@
static bool parsePersonaInfo( const OString rBuffer, OUString *pHeaderURL,
OUString *pFooterURL, OUString *pTextColor, OUString *pAccentColor )
{
// it is the first attribute that contains persona=
-sal_Int32 persona = rBuffer.indexOf( persona=\{ );
+sal_Int32 persona = rBuffer.indexOf( data-browsertheme=\{ );
if ( persona 0 )
return false;
// now search inside
-*pHeaderURL = searchValue( rBuffer, persona,
quot;headerURLquot;:quot; );
+*pHeaderURL = searchValue( rBuffer, persona, #34;headerURL#34;:#34; );
if ( pHeaderURL-isEmpty() )
return false;
-*pFooterURL = searchValue( rBuffer, persona,
quot;footerURLquot;:quot; );
+*pFooterURL = searchValue( rBuffer, persona, #34;footerURL#34;:#34; );
if ( pFooterURL-isEmpty() )
return false;
-*pTextColor = searchValue( rBuffer, persona,
quot;textcolorquot;:quot; );
+*pTextColor = searchValue( rBuffer, persona, #34;textcolor#34;:#34; );
if ( pTextColor-isEmpty() )
return false;
-*pAccentColor = searchValue( rBuffer, persona,
quot;accentcolorquot;:quot; );
+*pAccentColor = searchValue( rBuffer, persona,
#34;accentcolor#34;:#34; );
if ( pAccentColor-isEmpty() )
return false;
--
To view, visit https://gerrit.libreoffice.org/3483
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba1414c749bdf227b3945162da83e3d35ce86244
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-3
Gerrit-Owner: Jan Holesovsky ke...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Degugging no more in make help :-)
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3395 Approvals: Jan Holesovsky: Verified; Looks good to me, approved Joren De Cuyper: Looks good to me, but someone else must approve -- To view, visit https://gerrit.libreoffice.org/3395 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I032f9737746b39047b2d62df6821da4b3b9e9242 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Chris Sherlock chris.sherloc...@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz Gerrit-Reviewer: Joren De Cuyper joren.libreoff...@telenet.be ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#51615 replace button in FindReplace Dialog not search f...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3197 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3197 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia1735ae39618fb8b0e4749e1970adfe83192f755 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#60542 Persona setting: change color of the text menu.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/3127 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/3127 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d0ed94d41b3b8bcf0504e1528f4f505f817ad86 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Cao Cuong Ngo cao.cuong@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] Keep semantics, but improve readibility.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3186
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/86/3186/1
Keep semantics, but improve readibility.
Change-Id: I32c18cb7b080f4847118a2d7e8d77dcd2bbce308
---
M sw/source/core/docnode/ndtbl.cxx
1 file changed, 27 insertions(+), 30 deletions(-)
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 252ac7f..08b710a 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4022,39 +4022,36 @@
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt();
SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT,
RES_BOXATR_VALUE );
-sal_Bool bSetNumFmt = IsInsTblFormatNum(), bLockModify = sal_True;
+sal_Bool bSetNumFmt = IsInsTblFormatNum();
+sal_Bool bLockModify = sal_True;
+
+if( bSetNumFmt !IsInsTblChangeNumFormat() )
+{
+if( !pNumFmtItem )
+bSetNumFmt = sal_False;
+else
+{
+sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)-GetValue();
+SvNumberFormatter* pNumFmtr = GetNumberFormatter();
+
+short nFmtType = pNumFmtr-GetType( nFmtIdx );
+if( nFmtType == pNumFmtr-GetType( nOldNumFmt ) ||
NUMBERFORMAT_NUMBER == nFmtType )
+// Current and specified NumFormat match
+// - keep old Format
+nFmtIdx = nOldNumFmt;
+else
+// Current and specified NumFormat do not match
+// - insert as Text
+bLockModify = bSetNumFmt = sal_False;
+}
+}
+
if( bSetNumFmt )
{
-if( !IsInsTblChangeNumFormat() )
-{
-if( !pNumFmtItem )
-bSetNumFmt = sal_False;
-else
-{
-sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)-
-GetValue();
-SvNumberFormatter* pNumFmtr = GetNumberFormatter();
+pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
-short nFmtType = pNumFmtr-GetType( nFmtIdx );
-if( nFmtType == pNumFmtr-GetType( nOldNumFmt ) ||
-NUMBERFORMAT_NUMBER == nFmtType )
-// Current and specified NumFormat match
-// - keep old Format
-nFmtIdx = nOldNumFmt;
-else
-// Current and specified NumFormat do not match
-// - insert as Text
-bLockModify = bSetNumFmt = sal_False;
-}
-}
-
-if( bSetNumFmt )
-{
-pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
-
-aBoxSet.Put( SwTblBoxValue( fNumber ));
-aBoxSet.Put( SwTblBoxNumFormat( nFmtIdx ));
-}
+aBoxSet.Put( SwTblBoxValue( fNumber ));
+aBoxSet.Put( SwTblBoxNumFormat( nFmtIdx ));
}
// It's not enough to only reset the Formula.
--
To view, visit https://gerrit.libreoffice.org/3186
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I32c18cb7b080f4847118a2d7e8d77dcd2bbce308
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jan Holesovsky ke...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH libreoffice-4-0] fdo#32082: Do not reset number format in table cells on edit...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/3187
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/87/3187/1
fdo#32082: Do not reset number format in table cells on edit.
When we changed the default to _not_ to recognize the number formats in table
cells (commit 334c34e4ec803c65e43abf20edbc6faf7fa95e76), it caused that any
edit of a number formatted cell had reset it to text on edit.
This was quite unexpected, because when eg. there was a number that contributed
to a sum, and it changed to text, the sum changed as if there was a '0' there.
To solve this, try hard to retain the number format regardless of the
'Recognize Number Formats' setting when there was a number formatting assigned
to the cell.
Change-Id: Ib43e0877420d90cdac7a0357d1ef3a549c866fb7
---
M sw/source/core/docnode/ndtbl.cxx
1 file changed, 21 insertions(+), 17 deletions(-)
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 08b710a..df85ebc 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -4022,31 +4022,35 @@
SwTableBoxFmt* pBoxFmt = (SwTableBoxFmt*)rBox.GetFrmFmt();
SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT,
RES_BOXATR_VALUE );
-sal_Bool bSetNumFmt = IsInsTblFormatNum();
sal_Bool bLockModify = sal_True;
+sal_Bool bSetNumFmt = sal_False;
+const bool bForceNumberFormat = IsInsTblFormatNum()
IsInsTblChangeNumFormat();
-if( bSetNumFmt !IsInsTblChangeNumFormat() )
+// if the user forced a number format in this cell previously,
+// keep it, unless the user set that she wants the full number
+// format recognition
+if( pNumFmtItem !bForceNumberFormat )
{
-if( !pNumFmtItem )
-bSetNumFmt = sal_False;
+sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)-GetValue();
+SvNumberFormatter* pNumFmtr = GetNumberFormatter();
+
+short nFmtType = pNumFmtr-GetType( nFmtIdx );
+if( nFmtType == pNumFmtr-GetType( nOldNumFmt ) ||
NUMBERFORMAT_NUMBER == nFmtType )
+{
+// Current and specified NumFormat match
+// - keep old Format
+nFmtIdx = nOldNumFmt;
+bSetNumFmt = sal_True;
+}
else
{
-sal_uLong nOldNumFmt =
((SwTblBoxNumFormat*)pNumFmtItem)-GetValue();
-SvNumberFormatter* pNumFmtr = GetNumberFormatter();
-
-short nFmtType = pNumFmtr-GetType( nFmtIdx );
-if( nFmtType == pNumFmtr-GetType( nOldNumFmt ) ||
NUMBERFORMAT_NUMBER == nFmtType )
-// Current and specified NumFormat match
-// - keep old Format
-nFmtIdx = nOldNumFmt;
-else
-// Current and specified NumFormat do not match
-// - insert as Text
-bLockModify = bSetNumFmt = sal_False;
+// Current and specified NumFormat do not match
+// - insert as Text
+bLockModify = bSetNumFmt = sal_False;
}
}
-if( bSetNumFmt )
+if( bSetNumFmt || bForceNumberFormat )
{
pBoxFmt = (SwTableBoxFmt*)rBox.ClaimFrmFmt();
--
To view, visit https://gerrit.libreoffice.org/3187
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib43e0877420d90cdac7a0357d1ef3a549c866fb7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jan Holesovsky ke...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] update ccache for MSVC from 2.4 to 3.1.8
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2856 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2856 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I84c1fdc3f40bd2cefc47b5dc06c186d73ba72a08 Gerrit-PatchSet: 2 Gerrit-Project: dev-tools Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] WIP: fdo#47011 autosave feature
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2506 -- To view, visit https://gerrit.libreoffice.org/2506 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib2cbcc33e6188c60c183b5f47e9ae9c9d4c91b95 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Krisztian Pinter pin.termina...@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] fdo#48735: Save crop information in PPTX.
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2118 -- To view, visit https://gerrit.libreoffice.org/2118 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8aee13b11406988ab451034f43ee41c662add5fb Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: pallavi jadhav pallavi.jad...@synerzip.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz Gerrit-Reviewer: Muthu Subramanian K muthus...@gmail.com Gerrit-Reviewer: pallavi jadhav pallavi.jad...@synerzip.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ABANDONED libreoffice-4-0] fdo#53985 DOCX import: don't try to set empty PageDescName
Jan Holesovsky has abandoned this change. Change subject: fdo#53985 DOCX import: don't try to set empty PageDescName .. Patch Set 1: Abandoned I've cherry-picked this manually, abandoning this change :-) http://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-4-0id=0a12e1278b2ea6a4a668d610ff3c6a23c5fc6249 Thank you for this! -- To view, visit https://gerrit.libreoffice.org/2460 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ie04d5ad37555ed4cfeb34ccb8dc021675fbd25ea Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: libreoffice-4-0 Gerrit-Owner: Miklos Vajna vmik...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Move close button to most left of the findbar
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/2025 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/2025 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c13df4821f3f4f86fec02fa5427b2277fa10c19 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Joren De Cuyper joren.libreoff...@telenet.be Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] help-to-wiki.py now uses .po files as source of translations...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1989 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1989 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1f24f6a76781d651228bd5571f8f32fe05c0ecb9 Gerrit-PatchSet: 2 Gerrit-Project: help Gerrit-Branch: master Gerrit-Owner: Andras Timar ati...@suse.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Use application background consistently in Draw, fdo#59042
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1957 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1957 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I990a88b2726a7fafe8b15179962f004008090c7a Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth robert.roth@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Start center background color uses application background co...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1958 Approvals: Jan Holesovsky: Verified; Looks good to me, approved -- To view, visit https://gerrit.libreoffice.org/1958 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I781ea544e052e775f5cc1d709c5c3a319025ab12 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Robert Roth robert.roth@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Personas: Fix fdo#59208 - get rid of artifacts when we run o...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1742
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/1742/1
Personas: Fix fdo#59208 - get rid of artifacts when we run out of bitmap.
So far I am using the same color that is used for the workspace; should it be
a problem, we can use a different color.
Change-Id: I06fde7f31a9d37d2e387a7e3fd0b6d3d33f8d6e6
---
M vcl/source/window/dockingarea.cxx
M vcl/source/window/menu.cxx
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/vcl/source/window/dockingarea.cxx
b/vcl/source/window/dockingarea.cxx
index e20265d..c79c226 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -55,6 +55,7 @@
{
Wallpaper aWallpaper( rPersonaBitmap );
aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
+aWallpaper.SetColor(
Application::GetSettings().GetStyleSettings().GetWorkspaceColor() );
// we need to shift the bitmap vertically so that it spans over the
// menubar conveniently
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index ec35098..71a92b5 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3861,6 +3861,8 @@
{
Wallpaper aWallpaper( rPersonaBitmap );
aWallpaper.SetStyle( WALLPAPER_TOPRIGHT );
+aWallpaper.SetColor(
Application::GetSettings().GetStyleSettings().GetWorkspaceColor() );
+
pWin-SetBackground( aWallpaper );
pWin-SetPaintTransparent( sal_False );
pWin-SetParentClipMode( 0 );
--
To view, visit https://gerrit.libreoffice.org/1742
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I06fde7f31a9d37d2e387a7e3fd0b6d3d33f8d6e6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jan Holesovsky ke...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Personas: Fix fdo#59230 - make Personas fully work in non-NW...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1740
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/40/1740/1
Personas: Fix fdo#59230 - make Personas fully work in non-NWF case too.
Change-Id: I19a475f198fcb24c4d66134eb67da719fc99099e
---
M vcl/source/window/toolbox.cxx
M vcl/source/window/toolbox2.cxx
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 307957f..69585dc 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -565,7 +565,8 @@
if( !bNativeOk )
{
-if( !pThis-IsBackground() )
+if( !pThis-IsBackground() ||
+( pThis-GetAlign() == WINDOWALIGN_TOP
!Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() ) )
{
if( !pThis-IsInPaint() )
ImplDrawTransparentBackground( pThis, aPaintRegion );
@@ -1546,7 +1547,8 @@
}
else
{
-if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL ) )
+if( IsNativeControlSupported( CTRL_TOOLBAR, PART_ENTIRE_CONTROL )
||
+( GetAlign() == WINDOWALIGN_TOP
!Application::GetSettings().GetStyleSettings().GetPersonaHeader().IsEmpty() ) )
{
SetBackground();
SetPaintTransparent( sal_True );
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 2192d39..e598841 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -936,6 +936,9 @@
else
mbHorz = sal_True;
+// Update the background according to Persona if necessary
+ImplInitSettings( sal_False, sal_False, sal_True );
+
// Hier alles neu ausgeben, da sich Border auch aendert
mbCalc = sal_True;
mbFormat = sal_True;
--
To view, visit https://gerrit.libreoffice.org/1740
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I19a475f198fcb24c4d66134eb67da719fc99099e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jan Holesovsky ke...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Personas: Clear the BitmapEx first, so that we can switch of...
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1741
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/41/1741/1
Personas: Clear the BitmapEx first, so that we can switch off Personas.
[Also rename mpPersona*Bitmap - maPersona*Bitmap, it is not a pointer.]
Change-Id: I93cc56b1f30c4fe966b8de87b766e820d9e2cefa
---
M vcl/inc/vcl/settings.hxx
M vcl/source/app/settings.cxx
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 8e49b2c..9d99ad0 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -351,8 +351,8 @@
OUStringmaPersonaHeaderFooter; /// Cache the
settings to detect changes.
-BitmapExmpPersonaHeaderBitmap; /// Cache the
header bitmap.
-BitmapExmpPersonaFooterBitmap; /// Cache the
footer bitmap.
+BitmapExmaPersonaHeaderBitmap; /// Cache the
header bitmap.
+BitmapExmaPersonaFooterBitmap; /// Cache the
footer bitmap.
};
#define DEFAULT_WORKSPACE_GRADIENT_START_COLOR Color( 0xa3, 0xae, 0xb8 )
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 32366fa..4389453 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -203,8 +203,8 @@
ImplStyleData::ImplStyleData() :
maPersonaHeaderFooter(),
-mpPersonaHeaderBitmap(),
-mpPersonaFooterBitmap()
+maPersonaHeaderBitmap(),
+maPersonaFooterBitmap()
{
mnRefCount = 1;
mnScrollBarSize = 16;
@@ -304,8 +304,8 @@
maDialogStyle( rData.maDialogStyle ),
maFrameStyle( rData.maFrameStyle ),
maPersonaHeaderFooter( rData.maPersonaHeaderFooter ),
-mpPersonaHeaderBitmap( rData.mpPersonaHeaderBitmap ),
-mpPersonaFooterBitmap( rData.mpPersonaFooterBitmap )
+maPersonaHeaderBitmap( rData.maPersonaHeaderBitmap ),
+maPersonaFooterBitmap( rData.maPersonaFooterBitmap )
{
mnRefCount = 1;
mnBorderSize= rData.mnBorderSize;
@@ -718,6 +718,7 @@
return;
rHeaderFooter = aOldValue;
+rHeaderFooterBitmap = BitmapEx();
// now read the new values and setup bitmaps
OUString aHeader, aFooter;
@@ -761,14 +762,14 @@
const BitmapEx StyleSettings::GetPersonaHeader() const
{
-setupPersonaHeaderFooter( PERSONA_HEADER, mpData-maPersonaHeaderFooter,
mpData-mpPersonaHeaderBitmap );
-return mpData-mpPersonaHeaderBitmap;
+setupPersonaHeaderFooter( PERSONA_HEADER, mpData-maPersonaHeaderFooter,
mpData-maPersonaHeaderBitmap );
+return mpData-maPersonaHeaderBitmap;
}
const BitmapEx StyleSettings::GetPersonaFooter() const
{
-setupPersonaHeaderFooter( PERSONA_FOOTER, mpData-maPersonaHeaderFooter,
mpData-mpPersonaFooterBitmap );
-return mpData-mpPersonaFooterBitmap;
+setupPersonaHeaderFooter( PERSONA_FOOTER, mpData-maPersonaHeaderFooter,
mpData-maPersonaFooterBitmap );
+return mpData-maPersonaFooterBitmap;
}
// ---
--
To view, visit https://gerrit.libreoffice.org/1741
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I93cc56b1f30c4fe966b8de87b766e820d9e2cefa
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jan Holesovsky ke...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] Change in core[libreoffice-4-0]: Personas: Fix one more potential crash.
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1739
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/39/1739/1
Personas: Fix one more potential crash.
Change-Id: Ib7aca26c34aa8484e8c71873805ca8e8812526a7
---
M vcl/source/control/ctrl.cxx
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index e89e5c9..bfa45d4 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -444,16 +444,17 @@
(rDCEvt.GetType() == DATACHANGED_SETTINGS)
(rDCEvt.GetFlags() SETTINGS_STYLE) )
{
-AllSettings aSettings = GetSettings();
-StyleSettings aStyleSettings = aSettings.GetStyleSettings();
-sal_uLong nOldOptions =
rDCEvt.GetOldSettings()-GetStyleSettings().GetOptions();
-sal_uLong nNewOptions = aStyleSettings.GetOptions();
+const AllSettings* pOldSettings = rDCEvt.GetOldSettings();
-if ( !(nNewOptions STYLE_OPTION_MONO) ( nOldOptions
STYLE_OPTION_MONO ) )
+AllSettings aSettings = GetSettings();
+StyleSettings aStyleSettings = aSettings.GetStyleSettings();
+sal_uLong nNewOptions = aStyleSettings.GetOptions();
+
+if ( pOldSettings !(nNewOptions STYLE_OPTION_MONO) (
pOldSettings-GetStyleSettings().GetOptions() STYLE_OPTION_MONO ) )
{
nNewOptions |= STYLE_OPTION_MONO;
aStyleSettings.SetOptions( nNewOptions );
-aStyleSettings.SetMonoColor(
rDCEvt.GetOldSettings()-GetStyleSettings().GetMonoColor() );
+aStyleSettings.SetMonoColor(
pOldSettings-GetStyleSettings().GetMonoColor() );
aSettings.SetStyleSettings( aStyleSettings );
SetSettings( aSettings );
}
--
To view, visit https://gerrit.libreoffice.org/1739
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7aca26c34aa8484e8c71873805ca8e8812526a7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Jan Holesovsky ke...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PUSHED] Changed Writer follow-up Style for Title to be Text body...
Hi, Thank you for your patch! It has been merged to LibreOffice. If you are interested in details, please visit https://gerrit.libreoffice.org/1349 -- To view, visit https://gerrit.libreoffice.org/1349 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4fc091446ada5f4aea82ba79dba84f2874bca760 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Samuel Mehrbrodt s.mehrbr...@gmail.com Gerrit-Reviewer: Jan Holesovsky ke...@suse.cz Gerrit-Reviewer: Samuel Mehrbrodt s.mehrbr...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
