[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source

[Caolán McNamara]

 cui/source/inc/autocdlg.hxx  |2 +-
 cui/source/tabpages/autocdlg.cxx |   21 ++---
 2 files changed, 19 insertions(+), 4 deletions(-)

New commits:
commit feb79618508ce7888ae684dcd4501124579eeac2
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Sep 16 15:04:47 2013 +0100

Resolves: fdo#67697 source formatting option list in autocorrect

regression from 0513e10635c85fc1aa214948de4992d4b76d555c
fdo#49350 Speedup OK action of auto-correct dialog

(cherry picked from commit 95e566b9a0df06d130e118181058273f034bcf2c)

Conflicts:
cui/source/tabpages/autocdlg.cxx

Change-Id: Iede6063729433beb3ac50dbdb45230c1d774cea0
Reviewed-on: https://gerrit.libreoffice.org/5958
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index abaf70c..f76be9c 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -280,7 +280,7 @@ public:
 
 voidSetLanguage(LanguageType eSet);
 voidDeleteEntry(String sShort, String sLong);
-voidNewEntry(String sShort, String sLong);
+voidNewEntry(String sShort, String sLong, bool bKeepSourceFormatting);
 };
 
 // class OfaAutocorrExceptPage -
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index f8a5fe5..cb4cf9d 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -945,6 +945,17 @@ sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet )
 for (sal_uInt32 i = 0; i  rStringChangeList.aNewEntries.size(); i++)
 {
 DoubleString newEntry = rStringChangeList.aNewEntries[i];
+
+//fdo#67697 if the user data is set then we want to retain the
+//source formatting of the entry, so don't use the optimized
+//text-only MakeCombinedChanges for this entry
+bool bKeepSourceFormatting = newEntry.pUserData == 
bHasSelectionText;
+if (bKeepSourceFormatting)
+{
+pAutoCorrect-PutText(newEntry.sShort, 
*SfxObjectShell::Current(), eCurrentLang);
+continue;
+}
+
 SvxAutocorrWord aNewWord( newEntry.sShort, newEntry.sLong );
 aNewWords.push_back( aNewWord );
 }
@@ -1122,7 +1133,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, 
SvTabListBox*, pBox)
 return 0;
 };
 
-void OfaAutocorrReplacePage::NewEntry(String sShort, String sLong)
+void OfaAutocorrReplacePage::NewEntry(String sShort, String sLong, bool 
bKeepSourceFormatting)
 {
 DoubleStringArray rNewArray = aChangesTable[eLang].aNewEntries;
 for (sal_uInt32 i = 0; i  rNewArray.size(); i++)
@@ -1148,6 +1159,8 @@ void OfaAutocorrReplacePage::NewEntry(String sShort, 
String sLong)
 aNewString.sShort = sShort;
 aNewString.sLong = sLong;
 rNewArray.push_back(aNewString);
+if (bKeepSourceFormatting)
+rNewArray.back().pUserData = bHasSelectionText;
 }
 
 void OfaAutocorrReplacePage::DeleteEntry(String sShort, String sLong)
@@ -1199,7 +1212,9 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, 
pBtn)
 if(sEntry.Len()  ( aReplaceED.GetText().Len() ||
 ( bHasSelectionText  bSWriter ) ))
 {
-NewEntry(aShortED.GetText(), aReplaceED.GetText());
+bool bKeepSourceFormatting = !bReplaceEditChanged  
!aTextOnlyCB.IsChecked();
+
+NewEntry(aShortED.GetText(), aReplaceED.GetText(), 
bKeepSourceFormatting);
 aReplaceTLB.SetUpdateMode(sal_False);
 sal_uInt32 nPos = UINT_MAX;
 sEntry += '\t';
@@ -1223,7 +1238,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, 
pBtn)
 SvTreeListEntry* pInsEntry = aReplaceTLB.InsertEntry(
 sEntry, static_cast SvTreeListEntry * 
(NULL), false,
 nPos == UINT_MAX ? LIST_APPEND : nPos);
-if( !bReplaceEditChanged  !aTextOnlyCB.IsChecked())
+if (bKeepSourceFormatting)
 {
 pInsEntry-SetUserData(bHasSelectionText); // new formatted 
text
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source

[Caolán McNamara]

 cui/source/tabpages/autocdlg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3367c767fec1b02f4493490e1ef5b2929dfbbd46
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jul 1 10:38:51 2013 +0100

Resolves: fdo#66403 infinite loop, typo i should be it

Conflicts:
cui/source/tabpages/autocdlg.cxx

Change-Id: Ia3ec1302649809b7a63befc0a48fb142f1169936
Reviewed-on: https://gerrit.libreoffice.org/4649
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index a99ec37..f8a5fe5 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1445,7 +1445,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet  
)
 }
 }
 
-for(std::vectorrtl::OUString::iterator it = 
rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); ++i)
+for(std::vectorrtl::OUString::iterator it = 
rArrays.aDoubleCapsStrings.begin(); it != rArrays.aDoubleCapsStrings.end(); 
++it)
 {
 String* s = new String(*it);
 if(!pWrdList-insert(s).second)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source

[David Tardon]

 cui/source/tabpages/tplnedef.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 938d2506d64bf995897be0c8f5b5ea50fac81302
Author: David Tardon dtar...@redhat.com
Date:   Tue Jun 25 16:18:58 2013 +0200

fdo#62119 fix copypasta

(cherry picked from commit 7a62a5c34a46715cb9d13c60f8423526c0625d1e)

Signed-off-by: David Tardon dtar...@redhat.com

Conflicts:
cui/source/tabpages/tplnedef.cxx

Change-Id: I236b14822ae1852298ccd28aca9b54bc79a97312
Reviewed-on: https://gerrit.libreoffice.org/4517
Reviewed-by: Thorsten Behrens tbehr...@suse.com
Tested-by: Thorsten Behrens tbehr...@suse.com

diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4718ec5..a31d296 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -768,7 +768,7 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ClickLoadHdl_Impl)
 aPathURL.removeFinalSlash();
 
 XDashListRef pDshLst = XPropertyList::CreatePropertyList(
-XGRADIENT_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE 
), pXPool )-AsDashList();
+XDASH_LIST, aPathURL.GetMainURL( INetURLObject::NO_DECODE ), 
pXPool )-AsDashList();
 pDshLst-SetName( aURL.getName() );
 
 if( pDshLst-Load() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source

[Andras Timar]

 cui/source/tabpages/autocdlg.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 91820e31aad5e85e5a584c143e60694772f10ac5
Author: Andras Timar ati...@suse.com
Date:   Tue May 21 08:27:19 2013 +0200

fdo#64652 remove length restriction of Replace edit box

Change-Id: I0141dc06d940e64244909ddcb8b7e5bb797c337f
Reviewed-on: https://gerrit.libreoffice.org/3986
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 48bd0c7..a99ec37 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -896,7 +896,6 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* 
pParent,
 
 aReplaceED.SetSpaces( sal_True );
 aShortED.SetSpaces( sal_True );
-aShortED.SetMaxTextLen( 30 );
 }
 
 OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source

[Andras Timar]

 cui/source/dialogs/winpluginlib.cxx |   31 +--
 1 file changed, 5 insertions(+), 26 deletions(-)

New commits:
commit f577975db513c2108600a1fabd1f7560c95b3db2
Author: Andras Timar ati...@suse.com
Date:   Sat May 4 09:48:27 2013 -0700

fdo#54087 refactor/fix browser plugin detection on Windows

Former code did not find the Firefox plugin, if it was
registered under HKEY_CURRENT_USER. Therefore the checkbox state was not
preserved in Tools - Options - Internet - Browser Plug-in.

Change-Id: I9ae2a7dae1501500d7ea7cb42517605219450af3
Reviewed-on: https://gerrit.libreoffice.org/3784
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/cui/source/dialogs/winpluginlib.cxx 
b/cui/source/dialogs/winpluginlib.cxx
index ce4ab24..5391375 100644
--- a/cui/source/dialogs/winpluginlib.cxx
+++ b/cui/source/dialogs/winpluginlib.cxx
@@ -33,37 +33,18 @@
 extern C {
 int lc_isInstalled(const  char* realFilePath)
 {
-HKEY hKeySoftware;
-HKEY hMozillaPlugins;
-HKEY hStarOffice;
+HKEY hLibreOffice;
 char sSoPath[SO_PATH_SIZE];
 char sPluginPath[SO_PATH_SIZE];
 
 LONG ret;
-ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,  SOFTWARE,  0,  KEY_READ, 
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_LOCAL_MACHINE,  
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0,  0,  KEY_READ, 
hLibreOffice);
 if(ret != ERROR_SUCCESS){
-ret = RegOpenKeyEx(HKEY_CURRENT_USER,  SOFTWARE,  0,  KEY_READ, 
hKeySoftware);
+ret = RegOpenKeyEx(HKEY_CURRENT_USER,  
SOFTWARE\\MozillaPlugins\\@sun.com/npsopluginmi;version=1.0,  0,  KEY_READ, 
hLibreOffice);
 if(ret != ERROR_SUCCESS){
 return -1;
 }
 }
-ret = RegOpenKeyEx(hKeySoftware,  MozillaPlugins,  0,  KEY_READ, 
hMozillaPlugins);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
-ret = RegOpenKeyEx(hMozillaPlugins,  @sun.com/npsopluginmi;version=1.0,  
0,  KEY_READ, hStarOffice);
-if(ret != ERROR_SUCCESS){
-RegCloseKey(hKeySoftware);
-RegCloseKey(hMozillaPlugins);
-if( ret == ERROR_FILE_NOT_FOUND)
-return 1;
-else
-return -1;
-}
 
 if((realFilePath == NULL) || (strlen(realFilePath) == 0) || 
(strlen(realFilePath) = SO_PATH_SIZE))
 ret = -1;
@@ -76,7 +57,7 @@ int lc_isInstalled(const  char* realFilePath)
 if(ret == 0){
 DWORD  dType = REG_SZ;
 DWORD  dSize = SO_PATH_SIZE;
-ret = RegQueryValueEx (hStarOffice, Path, NULL,  dType , (LPBYTE) 
sPluginPath, dSize);
+ret = RegQueryValueEx (hLibreOffice, Path, NULL,  dType , (LPBYTE) 
sPluginPath, dSize);
 if(ret == ERROR_SUCCESS){
 if(strcmp(sPluginPath, sSoPath) == 0)
 ret = 0;
@@ -88,9 +69,7 @@ int lc_isInstalled(const  char* realFilePath)
 }
 else
 ret = -1;
-RegCloseKey(hStarOffice);
-RegCloseKey(hMozillaPlugins);
-RegCloseKey(hKeySoftware);
+RegCloseKey(hLibreOffice);
 return ret;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source

[Caolán McNamara]

 cui/source/inc/macroass.hxx  |1 +
 cui/source/tabpages/macroass.cxx |   31 +++
 2 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit cfe7f8750ce4b63e48a69557c8aed6d8523f8896
Author: Caolán McNamara caol...@redhat.com
Date:   Fri May 3 17:17:10 2013 +0100

fdo#62797 fix macro assign dialog

Which was empty of contents e.g. from autotext-macro...

because of 5d84af7e83404f22d3c9cd0b0bb88fb84d0550e7
fdo#57553: Picture dialog Macro tab page: lazily init

which was because of bd2c14ec78a7549d4a19738154cdd5ea890f61c4
we have to have all tabpages in all modes now

which was because we need to create all tabpages in order to determine their
size for layout.

Change-Id: I01fe03abf3e4582e87927729286a21d0bac7037c

Change-Id: Ic662f6a927225b56820ccebf135b82ab1631974d
Signed-off-by: Andras Timar ati...@suse.com

diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index b7477422..11185dd 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -69,6 +69,7 @@ public:
 virtual voidPageCreated (SfxAllItemSet aSet);
 using TabPage::ActivatePage; // FIXME WTF is this nonsense?
 virtual voidActivatePage( const SfxItemSet );
+voidLaunchFillGroup();
 
 // - inherit from the base -
 virtual sal_BoolFillItemSet( SfxItemSet rSet );
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e91d3fb..4e20432 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -216,6 +216,16 @@ sal_Bool _SfxMacroTabPage::FillItemSet( SfxItemSet rSet )
 return sal_False;
 }
 
+void _SfxMacroTabPage::LaunchFillGroup()
+{
+if (!mpImpl-maFillGroupTimer.GetTimeoutHdl().IsSet())
+{
+mpImpl-maFillGroupTimer.SetTimeoutHdl( STATIC_LINK( this, 
_SfxMacroTabPage, TimeOut_Impl ) );
+mpImpl-maFillGroupTimer.SetTimeout( 0 );
+mpImpl-maFillGroupTimer.Start();
+}
+}
+
 void _SfxMacroTabPage::ActivatePage( const SfxItemSet )
 {
 // fdo#57553 lazily init script providers, because it is annoying if done
@@ -223,13 +233,9 @@ void _SfxMacroTabPage::ActivatePage( const SfxItemSet )
 if (!mpImpl-m_bDummyActivated)
 {
 mpImpl-m_bDummyActivated = true;
+return;
 }
-else if (!mpImpl-maFillGroupTimer.GetTimeoutHdl().IsSet())
-{
-mpImpl-maFillGroupTimer.SetTimeoutHdl( STATIC_LINK( this, 
_SfxMacroTabPage, TimeOut_Impl ) );
-mpImpl-maFillGroupTimer.SetTimeout( 0 );
-mpImpl-maFillGroupTimer.Start();
-}
+LaunchFillGroup();
 }
 
 void _SfxMacroTabPage::PageCreated (SfxAllItemSet aSet)
@@ -481,17 +487,26 @@ SfxMacroTabPage::SfxMacroTabPage( Window* pParent, const 
ResId rResId, const Re
 ScriptChanged();
 }
 
+namespace
+{
+SfxMacroTabPage* CreateSfxMacroTabPage( Window* pParent, const SfxItemSet 
rAttrSet )
+{
+return new SfxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_EVENTASSIGN 
), NULL, rAttrSet );
+}
+}
+
 SfxTabPage* SfxMacroTabPage::Create( Window* pParent, const SfxItemSet 
rAttrSet )
 {
-return new SfxMacroTabPage( pParent, CUI_RES( RID_SVXPAGE_EVENTASSIGN ), 
NULL, rAttrSet );
+return CreateSfxMacroTabPage(pParent, rAttrSet);
 }
 
 SfxMacroAssignDlg::SfxMacroAssignDlg( Window* pParent, const Reference XFrame 
 rxDocumentFrame, const SfxItemSet rSet )
 : SfxSingleTabDialog( pParent, rSet, 0 )
 {
-SfxTabPage* pPage = SfxMacroTabPage::Create( this, rSet );
+SfxMacroTabPage* pPage = CreateSfxMacroTabPage(this, rSet);
 pPage-SetFrame( rxDocumentFrame );
 SetTabPage( pPage );
+pPage-LaunchFillGroup();
 }
 
 SfxMacroAssignDlg::~SfxMacroAssignDlg()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source

[Jan Holesovsky]

 cui/source/options/personalization.cxx |   34 +++--
 1 file changed, 12 insertions(+), 22 deletions(-)

New commits:
commit ecc9e5e4e393a81ae5cd31c18e92b99e243b2ed8
Author: Jan Holesovsky ke...@suse.cz
Date:   Fri Apr 19 15:56:38 2013 +0200

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
Reviewed-on: https://gerrit.libreoffice.org/3482
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

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 @@ using namespace com::sun::star;
 /** 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 @@ SelectPersonaDialog::SelectPersonaDialog( Window *pParent )
 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();
-}
-
-// canonicalize the URL
-OUString aPersona( persona/ );
-sal_Int32 nPersona = aText.lastIndexOf( aPersona );
-
-if ( nPersona  0 )
-return OUString();
+if ( aText.startsWith( https://addons.mozilla.org/; ) )
+return aText;
 
-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 @@ static OUString searchValue( const OString rBuffer, 
sal_Int32 from, const OStri
 
 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 OUString searchValue( const OString rBuffer, 
sal_Int32 from, const OStri
 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;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source

[Caolán McNamara]

 cui/source/tabpages/tparea.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit d6d9c1137d4779e82a6060b4a0c74b589eaf9fbe
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Feb 27 20:57:01 2013 +

Resolves: fdo#61241 force area page to size itself for max visible controls

Change-Id: I2d67ce71528786ef300ab83ee1e5b1cad6b4abe8
(cherry picked from commit fc8022431a1684f3cfb1e2f7e4ec923a8e71df94)
Reviewed-on: https://gerrit.libreoffice.org/2450
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 87b410f..47f4878 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -765,6 +765,13 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const 
SfxItemSet rInAttrs ) :
 aLbColor.SetAccessibleRelationMemberOf( aFlProp );
 aMtrFldOffset.SetAccessibleRelationLabeledBy(aFlOffset);
 aMtrFldOffset.SetAccessibleName(aFlOffset.GetText());
+
+//fdo#61241 lock down size of this tab page until it's
+//converted to .ui (remember to use some sizegroups
+//that take into account hidden frames)
+Size aSize(GetSizePixel());
+set_width_request(aSize.Width());
+set_height_request(aSize.Height());
 }
 
 // ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - cui/source

[Andras Timar]

 cui/source/options/optgdlg.src |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a6d76052a0c620840829230cfc06787c6a24bc8d
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 18 20:02:06 2013 +0100

Fix the Ignore system input language label truncated in translations

Change-Id: I3d05135f7973d6ca9cb3e554a4c80544a17e6f60
Reviewed-on: https://gerrit.libreoffice.org/2246
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 9ed740d..0a15582 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -662,7 +662,7 @@ TabPage OFA_TP_LANGUAGES
 {
 HelpID = cui:CheckBox:OFA_TP_LANGUAGES:CB_IGNORE_LANG_CHANGE;
 Pos = MAP_APPFONT ( 12 , 188-11+13 ) ;
-Size = MAP_APPFONT ( 125 , RSC_CD_CHECKBOX_HEIGHT ) ;
+Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
 Text [ en-US ] = Ignore s~ystem input language;
 };
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits