[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optcolor.cxx  |2 +-
 cui/source/options/optpath.cxx   |2 +-
 cui/source/options/treeopt.cxx   |1 -
 cui/source/tabpages/autocdlg.cxx |1 -
 cui/source/tabpages/macroass.cxx |1 -
 cui/source/tabpages/numfmt.cxx   |1 -
 cui/source/tabpages/paragrph.cxx |1 -
 7 files changed, 2 insertions(+), 7 deletions(-)

New commits:
commit d210827c83e78fd0dbf6bd00828e29ac31b41abd
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 29 23:38:54 2013 +

loplugin: remove some unused strings, etc.

Change-Id: Ic18ca82a49ec346240a667462e73184694ce8feb

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 67d2fa8..168a46f 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -57,7 +57,7 @@ enum Group
 };
 
 // group data
-const char* vGroupNames[]
+const char* vGroupNames[] =
 {
 // the groups are in the same order as in enum Group above
 general,
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 577eb29..769e7be 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -829,7 +829,7 @@ void SvxPathTabPage::SetPathList(
 }
 catch( const Exception e )
 {
-SAL_WARN(cui, caught:   e.Message);
+SAL_WARN(cui.tabpages, caught:   e.Message);
 }
 }
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 78646f1..61445c9 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1531,7 +1531,6 @@ void OfaTreeOptionsDialog::Initialize( const Reference 
XFrame  _xFrame )
 setGroupName( ProductName, rGeneralArray.GetString(0) );
 nGroup = AddGroup( rGeneralArray.GetString(0), 0, 0, 
SID_GENERAL_OPTIONS );
 sal_uInt16 nEnd = static_cast sal_uInt16 ( rGeneralArray.Count() );
-String sPageTitle;
 
 for ( i = 1; i  nEnd; ++i )
 {
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index b64619f..42ece11 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2438,7 +2438,6 @@ void OfaSmartTagOptionsTabPage::FillListBox( const 
SmartTagMgr rSmartTagMgr )
 uno::Reference smarttags::XSmartTagRecognizer  xRec = 
rSmartTagMgr.GetRecognizer(i);
 
 const rtl::OUString aName = xRec-getName( aLocale );
-const rtl::OUString aDesc = xRec-getDescription( aLocale );
 const sal_Int32 nNumberOfSupportedSmartTags = xRec-getSmartTagCount();
 
 for ( sal_Int32 j = 0; j  nNumberOfSupportedSmartTags; ++j )
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index cfa9c8b..60df619 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -299,7 +299,6 @@ IMPL_STATIC_LINK( _SfxMacroTabPage, SelectEvent_Impl, 
SvTabListBox*, EMPTYARG )
 IMPL_STATIC_LINK( _SfxMacroTabPage, SelectGroup_Impl, ListBox*, EMPTYARG )
 {
 _SfxMacroTabPage_Impl*  pImpl = pThis-mpImpl;
-String  sSel( pImpl-pGroupLB-GetGroup() );
 pImpl-pGroupLB-GroupSelected();
 const String sScriptURI = pImpl-pMacroLB-GetSelectedScriptURI();
 String  aLabelText;
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 0969da7..9b21749 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -806,7 +806,6 @@ void SvxNumberFormatTabPage::FillFormatListBox_Impl( 
std::vectorString* rEntr
 {
 String* pEntry;
 String  aTmpString;
-String  aTmpCatString;
 FontaFont=m_pLbCategory-GetFont();
 size_t  i = 0;
 short   nTmpCatPos;
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 6f99231..693012c 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -422,7 +422,6 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet rSet )
 {
 SfxItemPool* pPool = rSet.GetPool();
 DBG_ASSERT( pPool, Wo ist der Pool? );
-String aEmpty;
 
 // adjust metric
 FieldUnit eFUnit = GetModuleFieldUnit( rSet );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optcolor.cxx |   15 ---
 1 file changed, 15 deletions(-)

New commits:
commit d1239373097d3e3693b1bab9b65e16558868c6d9
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jan 30 09:03:13 2013 +0200

WaE: unused function 'GetGroup'

Change-Id: I6105b293eef0c74688dfde5172c30590cfea62ec

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 168a46f..3a1b6fb 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -265,21 +265,6 @@ private:
 bool IsGroupVisible (Group) const;
 };
 
-namespace
-{
-
-// entry - group
-Group GetGroup (unsigned nEntry)
-{
-if (nEntry = ColorConfigEntryCount)
-return nGroupCount; // feature of an extension
-return vEntryInfo[nEntry].eGroup;
-}
-
-} // namespace
-
-
-
 //
 // ColorConfigWindow_Impl::Chapter
 //
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/dialogs/zoom.cxx |1 -
 cui/source/dialogs/zoom.hrc |   43 ---
 2 files changed, 44 deletions(-)

New commits:
commit a9b1c62b1a4977dae03e04622612b952edd7b629
Author: Robert Roth robert.roth@gmail.com
Date:   Sat Jan 26 00:30:07 2013 +0200

Cleanup after zoom dialog ui conversion

Change-Id: I99cbb6e739af352091446da11d8150b24c2a6207
Reviewed-on: https://gerrit.libreoffice.org/1873
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com

diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 3121529..de5997f 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -27,7 +27,6 @@
 #define _SVX_ZOOM_CXX
 
 #include cuires.hrc
-#include zoom.hrc
 
 #include zoom.hxx
 #include sfx2/zoomitem.hxx
diff --git a/cui/source/dialogs/zoom.hrc b/cui/source/dialogs/zoom.hrc
deleted file mode 100644
index c2a5bbc..000
--- a/cui/source/dialogs/zoom.hrc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the License); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_ZOOM_HRC
-#define _SVX_ZOOM_HRC
-
-// defines --
-
-#define FL_ZOOM 14
-#define BTN_OPTIMAL 15
-#define BTN_WHOLE_PAGE  16
-#define BTN_PAGE_WIDTH  17
-#define BTN_100 18
-#define BTN_USER19
-#define ED_USER 20
-
-#define FL_VIEWLAYOUT   21
-#define BTN_AUTOMATIC   22
-#define BTN_SINGLE  23
-#define BTN_COLUMNS 24
-#define ED_COLUMNS  25
-#define CHK_BOOK26
-
-#define FL_BOTTOM   27
-#define BTN_ZOOM_OK 28
-#define BTN_ZOOM_CANCEL 29
-#define BTN_ZOOM_HELP   30
-
-#endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source cui/uiconfig

[Libreoffice Gerrit user]

 cui/source/tabpages/backgrnd.cxx  |4 +++-
 cui/uiconfig/ui/backgroundpage.ui |2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 557f75e7e1c1603f4fed9f0535c9cfda2a447569
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Jan 24 10:51:00 2013 +

set mnemonic widgets for background page

Change-Id: I977d8d7f1d14ea6616cf4dc3dc49d201804b7c39

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index afad498..74fa10d 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1530,6 +1530,7 @@ void SvxBackgroundTabPage::ShowTblControl()
 m_pTblLBox-SelectEntryPos(0);
 m_pTblDesc-Show();
 m_pTblLBox-Show();
+m_pTblDesc-set_mnemonic_widget(m_pTblLBox);
 }
 
 //---
@@ -1538,10 +1539,11 @@ void SvxBackgroundTabPage::ShowParaControl(sal_Bool 
bCharOnly)
 {
 m_pParaLBox-SetSelectHdl(HDL(ParaDestinationHdl_Impl));
 m_pParaLBox-SelectEntryPos(0);
-if(!bCharOnly)
+if (!bCharOnly)
 {
 m_pTblDesc-Show();
 m_pParaLBox-Show();
+m_pTblDesc-set_mnemonic_widget(m_pParaLBox);
 }
 m_pParaLBox-SetData(m_pParaLBox); // here it can be recognized that this 
mode is turned on
 }
diff --git a/cui/uiconfig/ui/backgroundpage.ui 
b/cui/uiconfig/ui/backgroundpage.ui
index 462cb13..b0fc516 100644
--- a/cui/uiconfig/ui/backgroundpage.ui
+++ b/cui/uiconfig/ui/backgroundpage.ui
@@ -27,6 +27,7 @@
 property name=no_show_allTrue/property
 property name=label translatable=yesA_s/property
 property name=use_underlineTrue/property
+property name=mnemonic_widgetselectlb/property
   /object
   packing
 property name=left_attach0/property
@@ -173,6 +174,7 @@
 property name=no_show_allTrue/property
 property name=label 
translatable=yes_Transparency/property
 property name=use_underlineTrue/property
+property 
name=mnemonic_widgettransparencymf:0%/property
   /object
   packing
 property name=left_attach0/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source forms/source sc/source sd/source tools/inc

[Libreoffice Gerrit user]

 cui/source/dialogs/scriptdlg.cxx  |5 +++--
 cui/source/options/opthtml.cxx|   14 +++---
 forms/source/solar/control/navtoolbar.cxx |2 +-
 sc/source/ui/app/inputwin.cxx |4 ++--
 sc/source/ui/dbgui/dbnamdlg.cxx   |6 +++---
 sd/source/ui/dlg/paragr.cxx   |2 +-
 tools/inc/tools/string.hxx|   22 ++
 7 files changed, 39 insertions(+), 16 deletions(-)

New commits:
commit fea25896a87aa5826eb243069d34aae7d0333a4c
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jan 21 21:42:46 2013 +0100

tools/string.hxx: add operator==/!= for OUString/String

This has the disadvantage that it makes comparisons involving fast
OUString concatenation via operator+ ambiguous, as can be seen in
scriptdlg.cxx, but it allows comparing String and OUString wihout
explicit conversion, which is nice for incrementally converting code.

Change-Id: Ibfc728bdb161a01e0f8311915c97bcbba8b58c0b
Reviewed-on: https://gerrit.libreoffice.org/1803
Reviewed-by: Luboš Luňák l.lu...@suse.cz
Tested-by: Luboš Luňák l.lu...@suse.cz

diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index f4b1e94..944ca6f 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -910,7 +910,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* 
pEntry )
 }
 for( sal_Int32 index = 0; index  childNodes.getLength(); index++ )
 {
-if ( (aNewName+extn) == childNodes[index]-getName() )
+if (OUString(aNewName+extn) == childNodes[index]-getName())
 {
 bFound = sal_True;
 break;
@@ -939,7 +939,8 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* 
pEntry )
 bValid = sal_True;
 for( sal_Int32 index = 0; index  childNodes.getLength(); 
index++ )
 {
-if ( (aUserSuppliedName+extn) == 
childNodes[index]-getName() )
+if (OUString(aUserSuppliedName+extn)
+== childNodes[index]-getName())
 {
 bValid = sal_False;
 String aError( m_createErrStr );
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 49a57fc..9993030 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -111,19 +111,19 @@ SfxTabPage* OfaHtmlTabPage::Create( Window* pParent,
 sal_Bool OfaHtmlTabPage::FillItemSet( SfxItemSet )
 {
 SvxHtmlOptions rHtmlOpt = SvxHtmlOptions::Get();
-if(OUString(aSize1NF.GetSavedValue()) != aSize1NF.GetText())
+if(aSize1NF.GetSavedValue() != aSize1NF.GetText())
 rHtmlOpt.SetFontSize(0, (sal_uInt16)aSize1NF.GetValue());
-if(OUString(aSize2NF.GetSavedValue()) != aSize2NF.GetText())
+if(aSize2NF.GetSavedValue() != aSize2NF.GetText())
 rHtmlOpt.SetFontSize(1, (sal_uInt16)aSize2NF.GetValue());
-if(OUString(aSize3NF.GetSavedValue()) != aSize3NF.GetText())
+if(aSize3NF.GetSavedValue() != aSize3NF.GetText())
 rHtmlOpt.SetFontSize(2, (sal_uInt16)aSize3NF.GetValue());
-if(OUString(aSize4NF.GetSavedValue()) != aSize4NF.GetText())
+if(aSize4NF.GetSavedValue() != aSize4NF.GetText())
 rHtmlOpt.SetFontSize(3, (sal_uInt16)aSize4NF.GetValue());
-if(OUString(aSize5NF.GetSavedValue()) != aSize5NF.GetText())
+if(aSize5NF.GetSavedValue() != aSize5NF.GetText())
 rHtmlOpt.SetFontSize(4, (sal_uInt16)aSize5NF.GetValue());
-if(OUString(aSize6NF.GetSavedValue()) != aSize6NF.GetText())
+if(aSize6NF.GetSavedValue() != aSize6NF.GetText())
 rHtmlOpt.SetFontSize(5, (sal_uInt16)aSize6NF.GetValue());
-if(OUString(aSize7NF.GetSavedValue()) != aSize7NF.GetText())
+if(aSize7NF.GetSavedValue() != aSize7NF.GetText())
 rHtmlOpt.SetFontSize(6, (sal_uInt16)aSize7NF.GetValue());
 
 if(aNumbersEnglishUSCB.IsChecked() != aNumbersEnglishUSCB.GetSavedValue())
diff --git a/forms/source/solar/control/navtoolbar.cxx 
b/forms/source/solar/control/navtoolbar.cxx
index a356a7f..f146a7e 100644
--- a/forms/source/solar/control/navtoolbar.cxx
+++ b/forms/source/solar/control/navtoolbar.cxx
@@ -685,7 +685,7 @@ namespace frm
 //-
 void RecordPositionInput::FirePosition( sal_Bool _bForce )
 {
-if ( _bForce || ( GetText() != OUString(GetSavedValue()) ) )
+if ( _bForce || (GetText() != GetSavedValue()) )
 {
 sal_Int64 nRecord = GetValue();
 if ( nRecord  GetMin() || nRecord  GetMax() )
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 64be1b4..79b71d8 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1373,7 +1373,7 @@ void ScMultiTextWnd::InitEditEngine()
 

[Libreoffice-commits] .: cui/source sfx2/source sw/source

[Libreoffice Gerrit user]

 cui/source/dialogs/SpellDialog.cxx |2 +-
 sfx2/source/dialog/dinfdlg.cxx |3 ++-
 sw/source/ui/docvw/SidebarWin.cxx  |3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit f55deeb525dd22194d4438f8b791bc344a77521e
Author: Michael Stahl mst...@redhat.com
Date:   Mon Jan 21 21:40:52 2013 +0100

fix previous string conversion:

- unconverted assertion in dinfdlg.cxx
- wrong replaceAt in SidebarWin.cxx
- obsolete cast in SpellDialog.cxx

Change-Id: I18450c0c6fdd275b7f81a7fce58cdf98bb806e27

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 135e9c0c..135f33d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1491,7 +1491,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent 
rNEvt )
 sal_Int32 nStart = pErrorAttr-GetStart();
 sal_Int32 nEnd = pErrorAttr-GetEnd();
 pTextEngine-RemoveAttrib( 0, *pErrorAttr );
-nStart = nStart - (sal_uInt16)nAddedChars;
+nStart = nStart - nAddedChars;
 SetAttrib( *pNewError, 0, nStart - nAddedChars, nEnd );
 //only if the error is active the mark is moved here
 if(bIsErrorActive)
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index bef196a..c765515 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1340,7 +1340,8 @@ sal_Bool SfxInternetPage::FillItemSet( SfxItemSet rSet )
 nDelay = static_castsal_uIntPtr(m_pNFReload-GetValue());
 break;
 case S_Forward:
-DBG_ASSERT( m_pEDForwardURL-GetText().Len(), 
+SfxInternetPage::FillItemSet(): empty URL should be not possible for forward 
option! );
+SAL_WARN_IF(m_pEDForwardURL-GetText().isEmpty(), sfx2,
++SfxInternetPage::FillItemSet(): empty URL should be not 
possible for forward option!);
 
 bEnableReload = sal_True;
 SAL_WNODEPRECATED_DECLARATIONS_PUSH
diff --git a/sw/source/ui/docvw/SidebarWin.cxx 
b/sw/source/ui/docvw/SidebarWin.cxx
index 4ee633b..0d128ee 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -384,8 +384,7 @@ void SwSidebarWin::CheckMetaText()
 }
 else if (sMeta.getLength()  22)
 {
-sMeta.replaceAt(20, sMeta.getLength()-20, );
-sMeta = sMeta + OUString(...);
+sMeta = sMeta.copy(0, 20) + OUString(...);
 }
 if ( mpMetadataAuthor-GetText() != sMeta )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/inc/backgrnd.hxx  |1 -
 cui/source/tabpages/backgrnd.cxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit c34cad49fadd376a61904e2201d85fbe908c348b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Sat Jan 19 12:27:14 2013 +0100

-Werror,-Wunused-private-field

Change-Id: I4d340043d7af96dec4f56b28eae1dd727e241da7

diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 67247d3..42975d9 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -110,7 +110,6 @@ private:
 sal_BoolbAllowShowSelector  : 1;
 sal_BoolbIsGraphicValid : 1;
 sal_BoolbLinkOnly   : 1;
-sal_BoolbResized: 1;
 sal_BoolbColTransparency: 1;
 sal_BoolbGraphTransparency  : 1;
 Graphic aBgdGraphic;
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index a9c3934..1151fb5 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -347,7 +347,6 @@ SvxBackgroundTabPage::SvxBackgroundTabPage(Window* pParent, 
const SfxItemSet rC
 , bAllowShowSelector(true)
 , bIsGraphicValid(false)
 , bLinkOnly(false)
-, bResized(false)
 , bColTransparency(false)
 , bGraphTransparency(false)
 , pPageImpl(new SvxBackgroundPage_Impl)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/border.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit cf9017ae189167962902e8ce28f5f36e89b30069
Author: Tor Lillqvist t...@iki.fi
Date:   Wed Jan 16 08:32:14 2013 +0200

WaE: unused variable 'aImgSize'

Change-Id: I192671cdec129b7c78638efb0c4339bfb265c47d

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index ad73329..2bd6766 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -921,7 +921,6 @@ sal_uInt16 SvxBorderTabPage::GetPresetStringId( sal_uInt16 
nValueSetIdx ) const
 void SvxBorderTabPage::FillPresetVS()
 {
 ImageList rImgList = aBorderImgLst;
-Size aImgSize( rImgList.GetImage( IID_PRE_CELL_NONE ).GetSizePixel() );
 
 // basic initialization of the ValueSet
 m_pWndPresets-SetStyle( m_pWndPresets-GetStyle() | WB_ITEMBORDER | 
WB_DOUBLEBORDER );
@@ -945,7 +944,6 @@ void SvxBorderTabPage::FillPresetVS()
 void SvxBorderTabPage::FillShadowVS()
 {
 ImageList rImgList = aShadowImgLst;
-Size aImgSize( rImgList.GetImage( IID_SHADOWNONE ).GetSizePixel() );
 
 // basic initialization of the ValueSet
 m_pWndShadows-SetStyle( m_pWndShadows-GetStyle() | WB_ITEMBORDER | 
WB_DOUBLEBORDER );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/chardlg.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit eccae3ee63cc561c0b0ace0b95e9a2344081bb9c
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Sat Jan 12 00:42:38 2013 +0900

Drop deserted m_aTransparentText

Its usage was gone with adda1a25f248586b46682bb9e19cd7a6b2c9debc.

Change-Id: I055c15f5154c6f78d2314d4b502ca3db751ab891

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 598edbc..ff52f40 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -237,7 +237,6 @@ struct SvxCharNamePage_Impl
 {
 Timer   m_aUpdateTimer;
 String  m_aNoStyleText;
-String  m_aTransparentText;
 const FontList* m_pFontList;
 sal_uInt16  m_nExtraEntryPos;
 sal_Boolm_bMustDelete;
@@ -282,7 +281,6 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const 
SfxItemSet rInSet )
 , m_pImpl(new SvxCharNamePage_Impl)
 {
 m_pImpl-m_aNoStyleText = String( CUI_RES( RID_SVXSTR_CHARNAME_NOSTYLE ) );
-m_pImpl-m_aTransparentText = String( CUI_RES( 
RID_SVXSTR_CHARNAME_TRANSPARENT ) );
 
 SvtLanguageOptions aLanguageOptions;
 sal_Bool bShowCJK = aLanguageOptions.IsCJKFontEnabled();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/autocdlg.src |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f900c56a32c1b29ea6330a85dcfa38bb7fbe6ae3
Author: Christopher Copits chrisc...@live.com
Date:   Mon Jan 7 20:19:38 2013 -0500

fdo#45964 - Wrong behavior of words list in AutoCorrect  Word Completion

The MultiListBox control should be initialized with the SimpleMode 
attribute set to True.

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

diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 299dcf9..4cd3beb 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -797,6 +797,7 @@ TabPage RID_OFAPAGE_AUTOCOMPLETE_OPTIONS
 Group = TRUE;
 Border = TRUE;
 Sort = TRUE;
+SimpleMode = TRUE;
 };
 PushButton PB_ENTRIES
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

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

New commits:
commit 844095f29af4ea2d9b42e1231456c4556a8f96f3
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Thu Jan 3 17:01:00 2013 +0200

WaE: unsafe mix of type 'bool' and type 'sal_Bool'

Change-Id: I927f7ea5cae396bb10ffc2568ec68ae69b8f3f82

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 5048a67..b4771de 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -370,7 +370,7 @@ void SpellDialog::UpdateBoxes_Impl()
 m_pExplainLink-Hide();
 }
 
-if (bOldShowExplain != m_pExplainLink-IsVisible() || bOldShowGrammar != 
m_pCheckGrammarCB-IsVisible())
+if (bOldShowExplain != (bool) m_pExplainLink-IsVisible() || 
bOldShowGrammar != (bool) m_pCheckGrammarCB-IsVisible())
 setInitialLayoutSize();
 }
 // ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source sfx2/source solenv/inc

[Libreoffice Gerrit user]

 cui/source/dialogs/about.src |2 +-
 sfx2/source/appl/app.src |2 +-
 solenv/inc/minor.mk  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 4f21a0de363116cde65151d09ef4af9aff08886c
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 1 14:42:33 2013 +0100

Bump copyright year to 2013

Change-Id: Iab660dcfffc2a511092398926338ed06f6408925

diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 9cd728f..defcf90 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -75,7 +75,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 - 2013 LibreOffice contributors 
and/or their affiliates;
 };
 String ABOUT_STR_BASED
 {
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index 78457ae..e32c5db 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -543,7 +543,7 @@ ModalDialog DLG_HELP_LICENSING
 String STR_LICENSING_INFORMATION_4
 {
 Text [ en-US ] =
-Copyright © 2000, 2012 LibreOffice contributors and/or their 
affiliates. All rights\n
+Copyright © 2000, 2013 LibreOffice contributors and/or their 
affiliates. All rights\n
 reserved. ;
 };
 String STR_LICENSING_INFORMATION_5
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 36f5986..7f9f543 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -8,4 +8,4 @@ VERSIONMAJOR=4
 VERSIONMINOR=1
 VERSIONMICRO=0
 
-COPYRIGHTYEARRANGE=2000-2012
+COPYRIGHTYEARRANGE=2000-2013
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source cui/uiconfig

[Libreoffice Gerrit user]

 cui/source/inc/chardlg.hxx  |4 -
 cui/source/tabpages/chardlg.cxx |   43 ++--
 cui/uiconfig/ui/charnamepage.ui |  135 +++-
 3 files changed, 157 insertions(+), 25 deletions(-)

New commits:
commit 94f21050aefc56769e49022c6444fd8cd8a4f37d
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Dec 20 20:30:03 2012 +

Resolves: fdo#58325 give each font category a separate info label

Change-Id: I1cc38341c2a9d28ab275765e488e5dac334ca0fa

diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 587161d..ce08f42 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -48,7 +48,6 @@ class SvxCharBasePage : public SfxTabPage
 {
 protected:
 SvxFontPrevWindow*  m_pPreviewWin;
-FixedText*  m_pFontTypeFT;
 
 sal_Boolm_bPreviewBackgroundToCharacter;
 
@@ -88,6 +87,7 @@ private:
 FontSizeBox*m_pWestFontSizeLB;
 FixedText*  m_pWestFontLanguageFT;
 SvxLanguageBox* m_pWestFontLanguageLB;
+FixedText*  m_pWestFontTypeFT;
 
 VclContainer*   m_pEastFrame;
 FixedText*  m_pEastFontNameFT;
@@ -98,6 +98,7 @@ private:
 FontSizeBox*m_pEastFontSizeLB;
 FixedText*  m_pEastFontLanguageFT;
 SvxLanguageBox* m_pEastFontLanguageLB;
+FixedText*  m_pEastFontTypeFT;
 
 VclContainer*   m_pCTLFrame;
 FixedText*  m_pCTLFontNameFT;
@@ -108,6 +109,7 @@ private:
 FontSizeBox*m_pCTLFontSizeLB;
 FixedText*  m_pCTLFontLanguageFT;
 SvxLanguageBox* m_pCTLFontLanguageLB;
+FixedText*  m_pCTLFontTypeFT;
 
 SvxCharNamePage_Impl*   m_pImpl;
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index f412fd3..598edbc 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -301,6 +301,7 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const 
SfxItemSet rInSet )
 
 get(m_pWestFontLanguageFT, westlangft-cjk);
 get(m_pWestFontLanguageLB, westlanglb-cjk);
+get(m_pWestFontTypeFT, westfontinfo-cjk);
 }
 else
 {
@@ -314,6 +315,7 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const 
SfxItemSet rInSet )
 
 get(m_pWestFontLanguageFT, westlangft-nocjk);
 get(m_pWestFontLanguageLB, westlanglb-nocjk);
+get(m_pWestFontTypeFT, westfontinfo-nocjk);
 }
 
 get(m_pEastFrame, asian);
@@ -325,6 +327,7 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const 
SfxItemSet rInSet )
 get(m_pEastFontSizeLB, eastsizelb);
 get(m_pEastFontLanguageFT, eastlangft);
 get(m_pEastFontLanguageLB, eastlanglb);
+get(m_pEastFontTypeFT, eastfontinfo);
 
 get(m_pCTLFrame, ctl);
 get(m_pCTLFontNameFT, ctlfontnameft);
@@ -335,6 +338,7 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const 
SfxItemSet rInSet )
 get(m_pCTLFontSizeLB, ctlsizelb);
 get(m_pCTLFontLanguageFT, ctllangft);
 get(m_pCTLFontLanguageLB, ctllanglb);
+get(m_pCTLFontTypeFT, ctlfontinfo);
 
 //In MacOSX the standard dialogs name font-name, font-style as
 //Family, Typeface
@@ -365,7 +369,6 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const 
SfxItemSet rInSet )
 m_pCTLFrame-Show(bShowCTL);
 
 get(m_pPreviewWin, preview);
-get(m_pFontTypeFT, fontinfo);
 
 m_pWestFontLanguageLB-SetLanguageList(LANG_LIST_WESTERN, sal_True, 
sal_False, sal_True);
 m_pEastFontLanguageLB-SetLanguageList(LANG_LIST_CJK, sal_True, sal_False, 
sal_True);
@@ -538,15 +541,25 @@ void SvxCharNamePage::UpdatePreview_Impl()
 // Font
 const FontList* pFontList = GetFontList();
 
-FontInfo aFontInfo =
-
calcFontInfo(rFont,this,m_pWestFontNameLB,m_pWestFontStyleLB,m_pWestFontSizeLB,m_pWestFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_FONT ),GetWhich( SID_ATTR_CHAR_FONTHEIGHT ));
+FontInfo aWestFontInfo = calcFontInfo(rFont, this, m_pWestFontNameLB,
+m_pWestFontStyleLB, m_pWestFontSizeLB, m_pWestFontLanguageLB,
+pFontList, GetWhich(SID_ATTR_CHAR_FONT),
+GetWhich(SID_ATTR_CHAR_FONTHEIGHT));
+m_pWestFontTypeFT-SetText(pFontList-GetFontMapText(aWestFontInfo));
 
-
calcFontInfo(rCJKFont,this,m_pEastFontNameLB,m_pEastFontStyleLB,m_pEastFontSizeLB,m_pEastFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_CJK_FONT ),GetWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT ));
+FontInfo aEastFontInfo = calcFontInfo(rCJKFont, this, m_pEastFontNameLB,
+m_pEastFontStyleLB, m_pEastFontSizeLB, m_pEastFontLanguageLB,
+pFontList, GetWhich(SID_ATTR_CHAR_CJK_FONT),
+GetWhich(SID_ATTR_CHAR_CJK_FONTHEIGHT));
+m_pEastFontTypeFT-SetText(pFontList-GetFontMapText(aEastFontInfo));
 
-
calcFontInfo(rCTLFont,this,m_pCTLFontNameLB,m_pCTLFontStyleLB,m_pCTLFontSizeLB,m_pCTLFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_CTL_FONT ),GetWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT ));
+FontInfo 

[Libreoffice-commits] .: cui/source cui/uiconfig svtools/inc svtools/source

[Libreoffice Gerrit user]

 cui/source/inc/chardlg.hxx  |1 
 cui/source/tabpages/chardlg.cxx |9 ++-
 cui/uiconfig/ui/charnamepage.ui |   15 +
 svtools/inc/svtools/ctrltool.hxx|   11 
 svtools/source/control/ctrltool.cxx |   97 ++--
 5 files changed, 127 insertions(+), 6 deletions(-)

New commits:
commit b53a329a7fef6262e437f8de0a771633a731704b
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 17 12:29:03 2012 +

Resolves: fdo#58373 restore label for font is printer/both or unavailable

I removed it because it only refers to the Western font and not the
two other categories. But apparently there's demand for it, so
better to restore it as misleading as it is for non-Western

Change-Id: I84c0cf858c16a9cadcba8d0c3993f0b0b7ad5a45

diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index c5b075d..587161d 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -48,6 +48,7 @@ class SvxCharBasePage : public SfxTabPage
 {
 protected:
 SvxFontPrevWindow*  m_pPreviewWin;
+FixedText*  m_pFontTypeFT;
 
 sal_Boolm_bPreviewBackgroundToCharacter;
 
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 4beeaeb..f412fd3 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -365,6 +365,7 @@ SvxCharNamePage::SvxCharNamePage( Window* pParent, const 
SfxItemSet rInSet )
 m_pCTLFrame-Show(bShowCTL);
 
 get(m_pPreviewWin, preview);
+get(m_pFontTypeFT, fontinfo);
 
 m_pWestFontLanguageLB-SetLanguageList(LANG_LIST_WESTERN, sal_True, 
sal_False, sal_True);
 m_pEastFontLanguageLB-SetLanguageList(LANG_LIST_CJK, sal_True, sal_False, 
sal_True);
@@ -537,13 +538,15 @@ void SvxCharNamePage::UpdatePreview_Impl()
 // Font
 const FontList* pFontList = GetFontList();
 
-
calcFontInfo(rFont,this,m_pWestFontNameLB,m_pWestFontStyleLB,m_pWestFontSizeLB,m_pWestFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_FONT ),GetWhich( SID_ATTR_CHAR_FONTHEIGHT ));
+FontInfo aFontInfo =
+
calcFontInfo(rFont,this,m_pWestFontNameLB,m_pWestFontStyleLB,m_pWestFontSizeLB,m_pWestFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_FONT ),GetWhich( SID_ATTR_CHAR_FONTHEIGHT ));
 
 
calcFontInfo(rCJKFont,this,m_pEastFontNameLB,m_pEastFontStyleLB,m_pEastFontSizeLB,m_pEastFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_CJK_FONT ),GetWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT ));
 
 
calcFontInfo(rCTLFont,this,m_pCTLFontNameLB,m_pCTLFontStyleLB,m_pCTLFontSizeLB,m_pCTLFontLanguageLB,pFontList,GetWhich(
 SID_ATTR_CHAR_CTL_FONT ),GetWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT ));
 
 m_pPreviewWin-Invalidate();
+m_pFontTypeFT-SetText( pFontList-GetFontMapText( aFontInfo ) );
 }
 
 // ---
@@ -819,6 +822,10 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet rSet, 
LanguageGroup eLangGrp
 }
 }
 
+if ( Western == eLangGrp )
+m_pFontTypeFT-SetText( pFontList-GetFontMapText(
+pFontList-Get( pNameBox-GetText(), pStyleBox-GetText() ) ) );
+
 // save these settings
 pNameBox-SaveValue();
 pStyleBox-SaveValue();
diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index eab5b32..df934e3 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -5,6 +5,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=orientationvertical/property
+property name=spacing6/property
 child
   object class=GtkFrame id=simple
 property name=can_focusFalse/property
@@ -623,6 +624,18 @@
   /packing
 /child
 child
+  object class=GtkLabel id=fontinfo
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=xalign0/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position4/property
+  /packing
+/child
+child
   object class=GtkFrame id=frame4
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -657,7 +670,7 @@
 property name=expandFalse/property
 property name=fillTrue/property
 property name=pack_typeend/property
-property name=position4/property
+property name=position5/property
   /packing
 /child
   /object
diff --git a/svtools/inc/svtools/ctrltool.hxx b/svtools/inc/svtools/ctrltool.hxx
index 33cd1e9..b90f1b6 100644
--- a/svtools/inc/svtools/ctrltool.hxx
+++ b/svtools/inc/svtools/ctrltool.hxx
@@ -83,6 +83,13 @@ Name generiert, der dem Anwender praesentiert werden kann.
 
 --
 
+XubString FontList::GetFontMapText( const FontInfo rInfo ) const;
+
+Diese Methode 

[Libreoffice-commits] .: cui/source desktop/source editeng/source

[Libreoffice Gerrit user]

 cui/source/tabpages/autocdlg.cxx   |6 ++---
 desktop/source/migration/migration.cxx |8 +++
 editeng/source/misc/svxacorr.cxx   |   35 +++--
 3 files changed, 27 insertions(+), 22 deletions(-)

New commits:
commit 623410669fa2d5da9a2ce4e3c4b81ce23605a6df
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 13 19:51:52 2012 +0100

fdo#58060 use acor_und.dat and LANGUAGE_UNDETERMINED

Previous versions used an empty language tag for LANGUAGE_DONTKNOW with the
[All] autocorrection entry and read/wrote from/to arco_.dat file. An empty
language tag otherwise is used for system locale and doesn't convert 
flawlessly
with the new LanguageTag system. Instead use LANGUAGE_UNDETERMINED with the 
ISO
639 code 'und' so the file name is acor_und.dat.

During user profile migration an existing 3/user/autocorr/acor_.dat is 
copied
to the new 4/user/autocorr/acor_und.dat

Change-Id: I593f24829c6efd58f36e93ebd3385a3c925f7217

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 66bf164..48bd0c7 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -111,7 +111,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const 
SfxItemSet* _pSet ) :
 
 // initialize languages
 //! LANGUAGE_NONE is displayed as '[All]' and the LanguageType
-//! will be set to LANGUAGE_DONTKNOW
+//! will be set to LANGUAGE_UNDETERMINED
 sal_Int16 nLangList = LANG_LIST_WESTERN;
 
 if( SvtLanguageOptions().IsCTLFontEnabled() )
@@ -120,13 +120,13 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const 
SfxItemSet* _pSet ) :
 aLanguageLB.SelectLanguage( LANGUAGE_NONE );
 sal_uInt16 nPos = aLanguageLB.GetSelectEntryPos();
 DBG_ASSERT( LISTBOX_ENTRY_NOTFOUND != nPos, listbox entry missing );
-aLanguageLB.SetEntryData( nPos, (void*)(long) LANGUAGE_DONTKNOW );
+aLanguageLB.SetEntryData( nPos, (void*)(long) LANGUAGE_UNDETERMINED );
 
 // Initializing doesn't work for static on linux - therefore here
 if( LANGUAGE_SYSTEM == eLastDialogLanguage )
 eLastDialogLanguage = 
Application::GetSettings().GetLanguageTag().getLanguageType();
 
-LanguageType nSelectLang = LANGUAGE_DONTKNOW;
+LanguageType nSelectLang = LANGUAGE_UNDETERMINED;
 nPos = aLanguageLB.GetEntryPos( (void*)(long) eLastDialogLanguage );
 if (LISTBOX_ENTRY_NOTFOUND != nPos)
 nSelectLang = eLastDialogLanguage;
diff --git a/desktop/source/migration/migration.cxx 
b/desktop/source/migration/migration.cxx
index 6036ef5..1b4115a 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -922,6 +922,14 @@ void MigrationImpl::copyFiles()
 {
 // remove installation prefix from file
 localName = i_file-copy(m_aInfo.userdata.getLength());
+if (localName.endsWith( /autocorr/acor_.dat))
+{
+// Previous versions used an empty language tag for
+// LANGUAGE_DONTKNOW with the [All] autocorrection entry.
+// As of LibreOffice 4.0 it is 'und' for LANGUAGE_UNDETERMINED
+// so the file name is acor_und.dat.
+localName = localName.copy( 0, localName.getLength() - 4) + 
und.dat;
+}
 destName = userInstall + localName;
 INetURLObject aURL(destName);
 // check whether destination directory exists
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index b4fa5d0..50c5b02 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -1481,11 +1481,11 @@ sal_Bool SvxAutoCorrect::AddCplSttException( const 
String rNew,
 pLists = nTmpVal-second;
 else
 {
-nTmpVal = pLangTable-find(LANGUAGE_DONTKNOW);
+nTmpVal = pLangTable-find(LANGUAGE_UNDETERMINED);
 if(nTmpVal != pLangTable-end())
 pLists = nTmpVal-second;
-else if(CreateLanguageFile(LANGUAGE_DONTKNOW, sal_True))
-pLists = pLangTable-find(LANGUAGE_DONTKNOW)-second;
+else if(CreateLanguageFile(LANGUAGE_UNDETERMINED, sal_True))
+pLists = pLangTable-find(LANGUAGE_UNDETERMINED)-second;
 }
 OSL_ENSURE(pLists, No auto correction data);
 return pLists-AddToCplSttExceptList(rNew);
@@ -1502,11 +1502,11 @@ sal_Bool SvxAutoCorrect::AddWrtSttException( const 
String rNew,
 pLists = nTmpVal-second;
 else
 {
-nTmpVal = pLangTable-find(LANGUAGE_DONTKNOW);
+nTmpVal = pLangTable-find(LANGUAGE_UNDETERMINED);
 if(nTmpVal != pLangTable-end())
 pLists = nTmpVal-second;
-else if(CreateLanguageFile(LANGUAGE_DONTKNOW, sal_True))
-pLists = pLangTable-find(LANGUAGE_DONTKNOW)-second;
+else if(CreateLanguageFile(LANGUAGE_UNDETERMINED, sal_True))
+pLists = 

[Libreoffice-commits] .: cui/source vcl/inc vcl/source

[Libreoffice Gerrit user]

 cui/source/dialogs/about.cxx |   39 ++--
 vcl/inc/vcl/svapp.hxx|1 
 vcl/inc/vcl/svgdata.hxx  |1 
 vcl/source/app/brand.cxx |   46 ---
 vcl/source/gdi/svgdata.cxx   |   29 +++
 5 files changed, 55 insertions(+), 61 deletions(-)

New commits:
commit 634ee953f1d090871834f6bc53faafaa7b96b874
Author: Muthu Subramanian sumu...@suse.com
Date:   Thu Dec 13 12:37:18 2012 +0530

fdo#56402: SVG in About Dialog.

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ddc3b46..cc62e89 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -207,22 +207,19 @@ void AboutDialog::LayoutControls()
 Size aLogoSize( aIdealTextWidth, aIdealTextWidth / 20 );
 Point aLogoPos( 0, 0 );
 
-#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
-vcl::RenderGraphicRasterizer aRasterizerLogo = 
Application::LoadBrandSVG(flat_logo);
-if ( !aRasterizerLogo.GetRenderGraphic().IsEmpty() 
- aRasterizerLogo.GetDefaultSizePixel().Width()  0  
aRasterizerLogo.GetDefaultSizePixel().Height()  0 )
+if( Application::LoadBrandSVG(flat_logo, aLogoBitmap) 
+!aLogoBitmap.IsEmpty() )
 {
-const float aLogoWidthHeightRatio = 
(float)aRasterizerLogo.GetDefaultSizePixel().Width() / 
(float)aRasterizerLogo.GetDefaultSizePixel().Height();
+const float aLogoWidthHeightRatio = 
(float)aLogoBitmap.GetSizePixel().Width() / 
(float)aLogoBitmap.GetSizePixel().Height();
 aLogoSize.Width() = aDialogSize.Width() ;
 aLogoSize.Height() = aLogoSize.Width() / aLogoWidthHeightRatio ;
+aLogoBitmap.Scale(aLogoSize);
 
-aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
 aLogoImage.SetImage( Image( aLogoBitmap ) );
 aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
 aLogoImage.Show();
 }
 else
-#endif
 {
 aLogoPos.X() = aDialogBorder;
 aLogoPos.Y() = aDialogBorder;
@@ -277,27 +274,21 @@ void AboutDialog::LayoutControls()
 
 
 // Layout background image
-#ifdef FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
-if ( 
!(Application::GetSettings().GetStyleSettings().GetHighContrastMode()) )   {
-vcl::RenderGraphicRasterizer aRasterizerBackground = 
Application::LoadBrandSVG(shell/about);
+if ( 
!(Application::GetSettings().GetStyleSettings().GetHighContrastMode()) 
+  Application::LoadBrandSVG(shell/about, aBackgroundBitmap) 
+  !aBackgroundBitmap.IsEmpty() )
+{
+const float aBackgroundWidthHeightRatio = 
(float)aBackgroundBitmap.GetSizePixel().Width() /
+(float)aBackgroundBitmap.GetSizePixel().Height();
+Size aBackgroundSize (aDialogSize.Width(), aDialogSize.Width() / 
aBackgroundWidthHeightRatio );
 
-if ( !aRasterizerBackground.GetRenderGraphic().IsEmpty() 
-aRasterizerBackground.GetDefaultSizePixel().Width()  0  
aRasterizerBackground.GetDefaultSizePixel().Height()  0 )
+if ( aBackgroundSize.Height()  aDialogSize.Height())
 {
-const float aBackgroundWidthHeightRatio = 
(float)aRasterizerBackground.GetDefaultSizePixel().Width() /
-   
(float)aRasterizerBackground.GetDefaultSizePixel().Height();
-Size aBackgroundSize (aDialogSize.Width(), aDialogSize.Width() / 
aBackgroundWidthHeightRatio );
-
-if ( aBackgroundSize.Height()  aDialogSize.Height())
-{
-aBackgroundSize.Width() = aDialogSize.Height() * 
aBackgroundWidthHeightRatio ;
-aBackgroundSize.Height() = aDialogSize.Height();
-}
-
-aBackgroundBitmap = aRasterizerBackground.Rasterize( 
aBackgroundSize );
+aBackgroundSize.Width() = aDialogSize.Height() * 
aBackgroundWidthHeightRatio ;
+aBackgroundSize.Height() = aDialogSize.Height();
 }
+aBackgroundBitmap.Scale(aBackgroundSize);
 }
-#endif
 
 SetOutputSizePixel( aDialogSize );
 
diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 0a1aa56..48b87d1 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.hxx
@@ -267,6 +267,7 @@ public:
 static void SetAppName( const String rUniqueName );
 static String   GetAppName();
 static bool LoadBrandBitmap (const char* pName, BitmapEx 
rBitmap);
+static bool LoadBrandSVG( const char *pName, BitmapEx 
rBitmap );
 
 // default name of the application for message dialogs and printing
 static void SetDisplayName( const UniString rDisplayName 
);
diff --git a/vcl/inc/vcl/svgdata.hxx b/vcl/inc/vcl/svgdata.hxx
index 488092c..dc4c9e5 100644
--- a/vcl/inc/vcl/svgdata.hxx
+++ b/vcl/inc/vcl/svgdata.hxx
@@ -57,6 +57,7 @@ private:
 
 public:
 SvgData(const SvgDataArray rSvgDataArray, sal_uInt32 nSvgDataArrayLength, 
const rtl::OUString rPath);
+SvgData(const 

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/treeopt.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a7320cbe406c0276a3c113a1adac93ed7a894dc2
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Dec 10 14:01:42 2012 +

de:Interner Test - en:Internal Test

Change-Id: I39210b28a098292d9457aac3f23083d49d7f5e61

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 0a19a77..df853ef 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1631,7 +1631,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference 
XFrame  _xFrame )
 AddTabPage( nPageId, rTextArray.GetString(i), nGroup );
 }
 #ifdef DBG_UTIL
-AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString(Interner 
Test), nGroup );
+AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString(Internal 
Test), nGroup );
 #endif
 }
 
@@ -1647,7 +1647,7 @@ void OfaTreeOptionsDialog::Initialize( const Reference 
XFrame  _xFrame )
 AddTabPage( nPageId, rHTMLArray.GetString(i), nGroup );
 }
 #ifdef DBG_UTIL
-AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString(Interner 
Test), nGroup );
+AddTabPage( RID_SW_TP_OPTTEST_PAGE, rtl::OUString(Internal 
Test), nGroup );
 #endif
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source cui/uiconfig

[Libreoffice Gerrit user]

 cui/source/options/personalization.cxx |   12 
 cui/uiconfig/ui/personalization_tab.ui |2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 1d3a86cfb11b3490806444e70683a8fa1fa1487d
Author: Jan Holesovsky ke...@suse.cz
Date:   Thu Dec 6 11:19:37 2012 +0100

Personas: Hide the Persona UI on non-Windows.

Change-Id: I6b2c9a33cb1c2144eb42a577071ade5b44b38964

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 562b7b4..b33acae 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -106,6 +106,18 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage( 
Window *pParent, const Sfx
 
 get( m_pSelectPersona, select_persona );
 m_pSelectPersona-SetClickHdl( LINK( this, SvxPersonalizationTabPage, 
SelectPersona ) );
+
+#ifndef __WIN32__
+// so far available for Windows only
+Window *pWindow;
+get( pWindow, personas_label );
+pWindow-Hide();
+
+m_pNoPersona-Hide();
+m_pDefaultPersona-Hide();
+m_pOwnPersona-Hide();
+m_pSelectPersona-Hide();
+#endif
 }
 
 SvxPersonalizationTabPage::~SvxPersonalizationTabPage()
diff --git a/cui/uiconfig/ui/personalization_tab.ui 
b/cui/uiconfig/ui/personalization_tab.ui
index 12acf49..f6f11be 100644
--- a/cui/uiconfig/ui/personalization_tab.ui
+++ b/cui/uiconfig/ui/personalization_tab.ui
@@ -216,7 +216,7 @@
   /object
 /child
 child type=label
-  object class=GtkLabel id=label1
+  object class=GtkLabel id=personas_label
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=label translatable=yesFirefox 
Personas/property
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/personalization.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 60b0a466ec6df97df14e7341228b8f8c2c48f8dc
Author: Luboš Luňák l.lu...@suse.cz
Date:   Tue Dec 4 23:32:26 2012 +0100

workaround for gcc-4.0.1 bug

Apparently it cannot do proper name resulution here despite the using 
namespace
near the top of the file.

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 4fe2b1b..c0d788c 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -69,9 +69,9 @@ OUString SelectPersonaDialog::GetPersonaURL() const
 
 IMPL_LINK( SelectPersonaDialog, VisitPersonas, PushButton*, /*pButton*/ )
 {
-uno::Reference system::XSystemShellExecute  xSystemShell( 
system::SystemShellExecute::create( ::comphelper::getProcessComponentContext() 
) );
+uno::Reference com::sun::star::system::XSystemShellExecute  
xSystemShell( com::sun::star::system::SystemShellExecute::create( 
::comphelper::getProcessComponentContext() ) );
 
-xSystemShell-execute( http://www.getpersonas.com;, OUString(), 
system::SystemShellExecuteFlags::URIS_ONLY );
+xSystemShell-execute( http://www.getpersonas.com;, OUString(), 
com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY );
 
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/numfmt.cxx  |4 ++--
 cui/source/tabpages/page.cxx|2 +-
 cui/source/tabpages/tpcolor.cxx |2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 399b92edc74cc06f800b17cd96059aa1f58e6501
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date:   Sat Dec 1 00:52:57 2012 +0100

OUString::valueOf ambiguous overloads

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 7bd349b..12c267b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1036,8 +1036,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool 
bCheckCatChange /*= sa
 aEdLeadZeroes   .Disable();
 aBtnNegRed  .Disable();
 aBtnThousand.Disable();
-aEdDecimals .SetText( OUString::valueOf( 0 ) );
-aEdLeadZeroes   .SetText( OUString::valueOf( 0 ) );
+aEdDecimals .SetText( OUString::valueOf( 
static_castsal_Int32(0) ) );
+aEdLeadZeroes   .SetText( OUString::valueOf( 
static_castsal_Int32(0) ) );
 aBtnNegRed  .Check( sal_False );
 aBtnThousand.Check( sal_False );
 }
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index b29d37b..50b6a57 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -944,7 +944,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl)
 {
 aName = aPaperBin;
 aName.Append( sal_Unicode(' ') );
-aName.Append( OUString::valueOf( i+1 ) );
+aName.Append( OUString::valueOf( static_castsal_Int32(i+1) ) );
 }
 nEntryPos = aPaperTrayBox.InsertEntry( aName );
 aPaperTrayBox.SetEntryData( nEntryPos, (void*)(sal_uLong)i );
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 6893994..9f4f98d 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -1223,7 +1223,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( 
sal_uInt16 nPercent )
 void SvxColorTabPage::FillUserData()
 {
 // the color model is saved in the Ini-file
-SetUserData( OUString::valueOf( eCM ) );
+SetUserData( OUString::valueOf( static_castsal_Int32(eCM) ) );
 }
 
 //
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/numfmt.cxx   |4 ++--
 cui/source/tabpages/numpages.cxx |8 
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 02a236be613b5b5fae1412bb01e28c0ba1d6b725
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sat Dec 1 19:07:45 2012 +0400

fix String-OUString conversion

OUString::valueOf(sal_uInt16) means OUString::valueOf(sal_Unicode),
we want OUString::valueOf(sal_Int32)

regression from 2cb8883cfd1c6ffe293497f064f90f76d12eff32

Change-Id: Ie1ea4de258b9f94f1c0cfec4335512e15be02e68

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 12c267b..fd4cd15 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1014,8 +1014,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool 
bCheckCatChange /*= sa
 aEdLeadZeroes.Enable();
 aBtnNegRed.Enable();
 aBtnThousand.Enable();
-aEdDecimals  .SetText( OUString::valueOf( nDecimals ) );
-aEdLeadZeroes.SetText( OUString::valueOf( nZeroes ) );
+aEdDecimals  .SetText( OUString::valueOf( 
static_castsal_Int32(nDecimals) ) );
+aEdLeadZeroes.SetText( OUString::valueOf( 
static_castsal_Int32(nZeroes) ) );
 aBtnNegRed   .Check( bNegRed );
 aBtnThousand .Check( bThousand );
 break;
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 05efd95..e1f3f82 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1280,11 +1280,11 @@ voidSvxNumOptionsTabPage::Reset( const SfxItemSet 
rSet )
 if(!aLevelLB.GetEntryCount())
 {
 for(sal_uInt16 i = 1; i = pSaveNum-GetLevelCount(); i++)
-aLevelLB.InsertEntry( OUString::valueOf(i));
+aLevelLB.InsertEntry( 
OUString::valueOf(static_castsal_Int32(i)));
 if(pSaveNum-GetLevelCount()  1)
 {
 OUString sEntry( 1 -  );
-sEntry += OUString::valueOf( pSaveNum-GetLevelCount() );
+sEntry += OUString::valueOf( 
static_castsal_Int32(pSaveNum-GetLevelCount()) );
 aLevelLB.InsertEntry(sEntry);
 aLevelLB.SelectEntry(sEntry);
 }
@@ -3044,11 +3044,11 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet 
rSet )
 if(!aLevelLB.GetEntryCount())
 {
 for(sal_uInt16 i = 1; i = pSaveNum-GetLevelCount(); i++)
-aLevelLB.InsertEntry( OUString::valueOf(i) );
+aLevelLB.InsertEntry( OUString::valueOf(static_castsal_Int32(i)) 
);
 if(pSaveNum-GetLevelCount()  1)
 {
 OUString sEntry( 1 -  );
-sEntry += OUString::valueOf( pSaveNum-GetLevelCount() );
+sEntry += OUString::valueOf( 
static_castsal_Int32(pSaveNum-GetLevelCount()) );
 aLevelLB.InsertEntry(sEntry);
 aLevelLB.SelectEntry(sEntry);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source desktop/inc desktop/source sfx2/source unotools/inc unotools/Library_utl.mk unotools/Package_inc.mk unotools/source

[Libreoffice Gerrit user]

 cui/source/options/optmemory.cxx |1 
 desktop/inc/app.hxx  |8 
 desktop/source/app/app.cxx   |2 
 desktop/source/app/appinit.cxx   |7 
 sfx2/source/appl/app.cxx |1 
 sfx2/source/appl/appmain.cxx |1 
 unotools/Library_utl.mk  |1 
 unotools/Package_inc.mk  |1 
 unotools/inc/unotools/itemholderbase.hxx |1 
 unotools/inc/unotools/startoptions.hxx   |  113 ---
 unotools/source/config/itemholder1.cxx   |5 
 unotools/source/config/startoptions.cxx  |  311 ---
 12 files changed, 12 insertions(+), 440 deletions(-)

New commits:
commit 4b5e98967f62607d3c6f75ea2490bac4787cc62b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 30 12:13:41 2012 +0100

Remove SvtStartOptions

...the single remaining user can use officecfg/Setup.hxx instead.

Change-Id: Icc1b56d820a9fcd7ecc52e279bcdde3aac4499d4

diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 4593fe7..9fd2c2b 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -36,7 +36,6 @@
 #include unotools/useroptions.hxx
 #include unotools/fontoptions.hxx
 #include svtools/menuoptions.hxx
-#include unotools/startoptions.hxx
 #include svl/cjkoptions.hxx
 #include svtools/miscopt.hxx
 #include unotools/syslocaleoptions.hxx
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 0a4c071..dfa74c4 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -32,6 +32,10 @@
 #include com/sun/star/uno/Reference.h
 #include osl/mutex.hxx
 
+namespace com { namespace sun { namespace star { namespace uno {
+class XComponentContext;
+} } } }
+
 using namespace com::sun::star::task;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
@@ -131,7 +135,9 @@ class Desktop : public Application
 // throws an exception upon failure
 
 private:
-voidRegisterServices();
+void RegisterServices(
+com::sun::star::uno::Reference
+com::sun::star::uno::XComponentContext  const  context);
 voidDeregisterServices();
 
 voidCreateTemporaryDirectory();
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cfa6a52..34ef4c4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1447,7 +1447,7 @@ int Desktop::Main()
 Reference XDesktop  xDesktop;
 try
 {
-RegisterServices();
+RegisterServices(comphelper::getProcessComponentContext());
 
 SetSplashScreenProgress(25);
 
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 06b6578..7012243 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -38,6 +38,7 @@
 #include uno/current_context.hxx
 #include cppuhelper/servicefactory.hxx
 #include cppuhelper/bootstrap.hxx
+#include officecfg/Setup.hxx
 #include osl/file.hxx
 #include osl/module.h
 #include rtl/uri.hxx
@@ -53,7 +54,6 @@
 #include unotools/ucbhelper.hxx
 #include unotools/tempfile.hxx
 #include vcl/svapp.hxx
-#include unotools/startoptions.hxx
 #include unotools/pathoptions.hxx
 #include unotools/internaloptions.hxx
 
@@ -119,7 +119,7 @@ void Desktop::InitApplicationServiceManager()
 comphelper::setProcessServiceFactory(sm);
 }
 
-void Desktop::RegisterServices()
+void Desktop::RegisterServices(Reference XComponentContext  const  context)
 {
 if( !m_bServicesRegistered )
 {
@@ -137,7 +137,8 @@ void Desktop::RegisterServices()
 Application::EnableHeadlessMode(false);
 
 // read accept string from configuration
-rtl::OUString conDcpCfg(SvtStartOptions().GetConnectionURL());
+OUString conDcpCfg(
+officecfg::Setup::Office::ooSetupConnectionURL::get(context));
 if (!conDcpCfg.isEmpty()) {
 createAcceptor(conDcpCfg);
 }
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index f586242..2c47a9d 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -108,7 +108,6 @@
 #include svtools/menuoptions.hxx
 #include svtools/miscopt.hxx
 #include unotools/useroptions.hxx
-#include unotools/startoptions.hxx
 #include unotools/securityoptions.hxx
 #include unotools/localisationoptions.hxx
 #include unotools/fontoptions.hxx
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx
index edf1478..d726fd6 100644
--- a/sfx2/source/appl/appmain.cxx
+++ b/sfx2/source/appl/appmain.cxx
@@ -22,7 +22,6 @@
 
 #include stdio.h
 #include svtools/ehdl.hxx
-#include unotools/startoptions.hxx
 #include svl/itempool.hxx
 #include svl/urihelper.hxx
 #include svtools/helpopt.hxx
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index ba34494..6a83b55 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/numfmt.cxx   |8 +++---
 cui/source/tabpages/numpages.cxx |   51 +++
 cui/source/tabpages/page.cxx |4 +--
 cui/source/tabpages/tpbitmap.cxx |   22 
 4 files changed, 42 insertions(+), 43 deletions(-)

New commits:
commit 2cb8883cfd1c6ffe293497f064f90f76d12eff32
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Fri Nov 30 14:10:50 2012 -0200

fdo#38838 UniString - OUString in cui

Change-Id: I9b629cad4d9b6d4c086bfff47f1d3e9779b2c24d
Reviewed-on: https://gerrit.libreoffice.org/1202
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 014f87b..7bd349b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1014,8 +1014,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool 
bCheckCatChange /*= sa
 aEdLeadZeroes.Enable();
 aBtnNegRed.Enable();
 aBtnThousand.Enable();
-aEdDecimals  .SetText( UniString::CreateFromInt32( nDecimals ) );
-aEdLeadZeroes.SetText( UniString::CreateFromInt32( nZeroes ) );
+aEdDecimals  .SetText( OUString::valueOf( nDecimals ) );
+aEdLeadZeroes.SetText( OUString::valueOf( nZeroes ) );
 aBtnNegRed   .Check( bNegRed );
 aBtnThousand .Check( bThousand );
 break;
@@ -1036,8 +1036,8 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( sal_Bool 
bCheckCatChange /*= sa
 aEdLeadZeroes   .Disable();
 aBtnNegRed  .Disable();
 aBtnThousand.Disable();
-aEdDecimals .SetText( UniString::CreateFromInt32( 0 ) );
-aEdLeadZeroes   .SetText( UniString::CreateFromInt32( 0 ) );
+aEdDecimals .SetText( OUString::valueOf( 0 ) );
+aEdLeadZeroes   .SetText( OUString::valueOf( 0 ) );
 aBtnNegRed  .Check( sal_False );
 aBtnThousand.Check( sal_False );
 }
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 3747402..d81de7b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -78,7 +78,6 @@ using namespace com::sun::star::i18n;
 using namespace com::sun::star::text;
 using namespace com::sun::star::container;
 using namespace com::sun::star::style;
-using rtl::OUString;
 
 #define NUM_PAGETYPE_BULLET 0
 #define NUM_PAGETYPE_SINGLENUM  1
@@ -170,7 +169,7 @@ static sal_Bool lcl_IsNumFmtSet(SvxNumRule* pNum, 
sal_uInt16 nLevelMask)
 static Font lcl_GetDefaultBulletFont()
 {
 static sal_Bool bInit = 0;
-static Font aDefBulletFont( rtl::OUString(StarSymbol),
+static Font aDefBulletFont( OUString(StarSymbol),
 String(), Size( 0, 14 ) );
 if(!bInit)
 {
@@ -504,8 +503,8 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl)
 SvxNumberFormat aFmt(pActNum-GetLevel(i));
 aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
 // #i93908# clear suffix for bullet lists
-aFmt.SetPrefix(::rtl::OUString());
-aFmt.SetSuffix(::rtl::OUString());
+aFmt.SetPrefix( OUString() );
+aFmt.SetSuffix( OUString() );
 aFmt.SetBulletFont(rActBulletFont);
 aFmt.SetBulletChar(cChar );
 aFmt.SetCharFmtName(sBulletCharFmtName);
@@ -716,8 +715,8 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
 if(aFmt.GetNumberingType() == SVX_NUM_CHAR_SPECIAL)
 {
 // #i93908# clear suffix for bullet lists
-aFmt.SetPrefix(::rtl::OUString());
-aFmt.SetSuffix(::rtl::OUString());
+aFmt.SetPrefix(OUString());
+aFmt.SetSuffix(OUString());
 if( !pLevelSettings-sBulletFont.isEmpty() 
 pLevelSettings-sBulletFont.compareTo(
 rActBulletFont.GetName()))
@@ -1281,11 +1280,11 @@ voidSvxNumOptionsTabPage::Reset( const SfxItemSet 
rSet )
 if(!aLevelLB.GetEntryCount())
 {
 for(sal_uInt16 i = 1; i = pSaveNum-GetLevelCount(); i++)
-aLevelLB.InsertEntry( UniString::CreateFromInt32(i));
+aLevelLB.InsertEntry( OUString::valueOf(i));
 if(pSaveNum-GetLevelCount()  1)
 {
-String sEntry(rtl::OUString(1 - ));
-sEntry += UniString::CreateFromInt32( pSaveNum-GetLevelCount() );
+String sEntry( OUString(1 - ) );
+sEntry += OUString::valueOf( pSaveNum-GetLevelCount() );
 aLevelLB.InsertEntry(sEntry);
 aLevelLB.SelectEntry(sEntry);
 }
@@ -2302,7 +2301,7 @@ static sal_uInt16 lcl_DrawBullet(VirtualDevice* pVDev,
 aBulletColor.Invert();
 

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/numpages.cxx |   10 +-
 cui/source/tabpages/tpcolor.cxx  |8 
 cui/source/tabpages/tpgradnt.cxx |   20 ++--
 cui/source/tabpages/tphatch.cxx  |   20 ++--
 cui/source/tabpages/tpline.cxx   |   12 ++--
 cui/source/tabpages/tplnedef.cxx |   10 +-
 cui/source/tabpages/tplneend.cxx |8 
 cui/source/tabpages/transfrm.cxx |2 +-
 8 files changed, 45 insertions(+), 45 deletions(-)

New commits:
commit ae2e02261de0c77394f28c19f07153dcb43bc330
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Fri Nov 30 14:23:35 2012 -0200

fdo#38838 UniString - OUString in cui

Change-Id: I16eae4aff2b946421df2b65ecfbd1d9b2e2256b6
Reviewed-on: https://gerrit.libreoffice.org/1203
Reviewed-by: Olivier Hallot olivier.hal...@alta.org.br
Tested-by: Olivier Hallot olivier.hal...@alta.org.br

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d81de7b..05efd95 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1283,7 +1283,7 @@ voidSvxNumOptionsTabPage::Reset( const SfxItemSet 
rSet )
 aLevelLB.InsertEntry( OUString::valueOf(i));
 if(pSaveNum-GetLevelCount()  1)
 {
-String sEntry( OUString(1 - ) );
+OUString sEntry( 1 -  );
 sEntry += OUString::valueOf( pSaveNum-GetLevelCount() );
 aLevelLB.InsertEntry(sEntry);
 aLevelLB.SelectEntry(sEntry);
@@ -2504,7 +2504,7 @@ voidSvxNumberingPreview::Paint( const Rectangle 
/*rRect*/ )
 else
 {
 //#i5153# painting gray or black rectangles as 'normal' numbering 
text
-String sMsg( Preview );
+OUString sMsg( Preview );
 long nWidth = pVDev-GetTextWidth(sMsg);
 long nTextHeight = pVDev-GetTextHeight();
 long nRectHeight = nTextHeight * 2 / 3;
@@ -2708,7 +2708,7 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* 
pParent,
 Point aPos(250,0);
 
 pDebugFixedText-SetPosSizePixel(aPos, aSize);
-pDebugFixedText-SetText( OUString(Das ist ein Debug-Text) );
+pDebugFixedText-SetText( Das ist ein Debug-Text );
 #endif
 
 aStandardPB.SetAccessibleRelationMemberOf(aPositionFL);
@@ -3047,8 +3047,8 @@ void SvxNumPositionTabPage::Reset( const SfxItemSet rSet 
)
 aLevelLB.InsertEntry( OUString::valueOf(i) );
 if(pSaveNum-GetLevelCount()  1)
 {
-String sEntry( OUString(1 - ) );
-sEntry.Append( OUString::valueOf( pSaveNum-GetLevelCount() ) );
+OUString sEntry( 1 -  );
+sEntry += OUString::valueOf( pSaveNum-GetLevelCount() );
 aLevelLB.InsertEntry(sEntry);
 aLevelLB.SelectEntry(sEntry);
 }
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index f8c3aff..6893994 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -131,7 +131,7 @@ void SvxLoadSaveEmbed::UpdateTableName()
 {
 // Truncate the name if necessary ...
 String aString( CUI_RES( RID_SVXSTR_TABLE ) );
-aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( :  ) );
+aString.AppendAscii( :  );
 
 XPropertyListRef pList = GetList();
 if( !pList.is() )
@@ -143,7 +143,7 @@ void SvxLoadSaveEmbed::UpdateTableName()
 if ( aURL.getBase().getLength()  18 )
 {
 aString += String(aURL.getBase()).Copy( 0, 15 );
-aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ... ) );
+aString.AppendAscii( ... );
 }
 else
 aString += String (aURL.getBase());
@@ -1049,7 +1049,7 @@ IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModelHdl_Impl)
 
 // handle CMYK-values (0..100%)
 // and adjust MetricFields respectively
-String aStrUnit( RTL_CONSTASCII_USTRINGPARAM(  % ) );
+String aStrUnit(  % );
 
 aMtrFldColorModel1.SetUnit(FUNIT_CUSTOM);
 aMtrFldColorModel1.SetCustomUnitText( aStrUnit );
@@ -1223,7 +1223,7 @@ sal_uInt16 SvxColorTabPage::PercentToColor_Impl( 
sal_uInt16 nPercent )
 void SvxColorTabPage::FillUserData()
 {
 // the color model is saved in the Ini-file
-SetUserData( UniString::CreateFromInt32( eCM ) );
+SetUserData( OUString::valueOf( eCM ) );
 }
 
 //
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index a5a37a0..c8fcb05 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -195,7 +195,7 @@ void SvxGradientTabPage::ActivatePage( const SfxItemSet  )
 
 // determining (and possibly cutting) the name and
 // displaying it in the GroupBox
-String  aString( CUI_RES( RID_SVXSTR_TABLE ) ); 
aString.AppendAscii( RTL_CONSTASCII_STRINGPARAM( :  ) );
+String 

[Libreoffice-commits] .: cui/source vcl/inc

[Libreoffice Gerrit user]

 cui/source/inc/treeopt.hxx |2 ++
 cui/source/options/treeopt.cxx |   20 
 vcl/inc/vcl/tabpage.hxx|4 ++--
 3 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit 9a19ef1a041d708f64cc20364b99d929ed01c406
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Nov 29 12:35:21 2012 +

make the options dialog layout incrementally convertable to .ui

it will now allocate the fixed reserved size for its tab pages to
layout-enabled tabpages

Change-Id: I5e56a09c5febc702d194f18954fd249bcd366dd9

diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 05321b2..ee6fa40 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -186,6 +186,8 @@ private:
 VectorOfNodes   LoadNodes( Module* pModule, const rtl::OUString 
rExtensionId );
 voidInsertNodes( const VectorOfNodes rNodeList );
 
+void SetPaneSize(Window *pPane);
+
 protected:
 DECL_LINK(ExpandedHdl_Impl, SvTreeListBox* );
 DECL_LINK(ShowPageHdl_Impl, void *);
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 5227729..aafbc68 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -913,6 +913,18 @@ longOfaTreeOptionsDialog::Notify( NotifyEvent rNEvt )
 }
 
 // 
+void OfaTreeOptionsDialog::SetPaneSize(Window *pPane)
+{
+//The OfaTreeOptionsDialog is not fully widget layout enabled
+//yet so it's a classic fixed dimension dialog, but to make
+//it possible to incrementally convert it over each pane
+//can be converted to .ui layout format and the fixed area
+//size reserved for panes is allocated to them here
+Point aPos(aSeparatorFL.GetPosPixel().X(), aTreeLB.GetPosPixel().Y());
+Size aSize(aSeparatorFL.GetSizePixel().Width(),
+   aSeparatorFL.GetPosPixel().Y() - aTreeLB.GetPosPixel().Y());
+pPane-SetPosSizePixel( aPos, aSize );
+}
 
 void OfaTreeOptionsDialog::SelectHdl_Impl()
 {
@@ -1050,6 +1062,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
 
 if(!pPageInfo-m_pPage  pGroupInfo-m_pModule)
 pPageInfo-m_pPage = 
pGroupInfo-m_pModule-CreateTabPage(pPageInfo-m_nPageId, this, 
*pGroupInfo-m_pInItemSet);
+
 }
 
 DBG_ASSERT( pPageInfo-m_pPage, tabpage could not created);
@@ -1069,6 +1082,8 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
 {
 pPageInfo-m_pPage-Reset( *pGroupInfo-m_pInItemSet );
 }
+if (pPageInfo-m_pPage-isLayoutEnabled())
+SetPaneSize(pPageInfo-m_pPage);
 }
 }
 else if ( 0 == pPageInfo-m_nPageId  !pPageInfo-m_pExtPage )
@@ -1085,10 +1100,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
 pPageInfo-m_pExtPage = new ExtensionsTabPage(
 this, 0, pPageInfo-m_sPageURL, pPageInfo-m_sEventHdl, 
m_xContainerWinProvider );
 
-Point aPos(aSeparatorFL.GetPosPixel().X(), aTreeLB.GetPosPixel().Y());
-Size aSize(aSeparatorFL.GetSizePixel().Width(),
-   aSeparatorFL.GetPosPixel().Y() - aTreeLB.GetPosPixel().Y());
-pPageInfo-m_pExtPage-SetPosSizePixel( aPos, aSize );
+SetPaneSize(pPageInfo-m_pExtPage);
 }
 
 if ( pPageInfo-m_pPage )
diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx
index 67a3469..1aa4b91 100644
--- a/vcl/inc/vcl/tabpage.hxx
+++ b/vcl/inc/vcl/tabpage.hxx
@@ -38,8 +38,6 @@ private:
 SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
 SAL_DLLPRIVATE void ImplInitSettings();
 
-bool isLayoutEnabled() const;
-
 public:
 TabPage( Window* pParent, WinBits nStyle = 0 );
 TabPage(Window *pParent, const rtl::OString rID, const 
rtl::OUString rUIXMLDescription);
@@ -55,6 +53,8 @@ public:
 virtual voidActivatePage();
 virtual voidDeactivatePage();
 
+bool isLayoutEnabled() const;
+
 //To-Do, consider inheriting from VclContainer
 virtual voidSetPosSizePixel(const Point rNewPos, const Size 
rNewSize);
 virtual voidSetPosPixel(const Point rNewPos);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source svtools/inc svtools/Library_svt.mk svtools/Package_inc.mk svtools/source svtools/uiconfig svtools/UI_svt.mk

[Libreoffice Gerrit user]

 cui/source/inc/cuires.hrc  |2 
 cui/source/options/optjava.cxx |6 -
 cui/source/options/optjava.src |7 -
 svtools/Library_svt.mk |1 
 svtools/Package_inc.mk |1 
 svtools/UI_svt.mk  |1 
 svtools/inc/svtools/restartdialog.hxx  |   40 +
 svtools/inc/svtools/svtools.hrc|6 -
 svtools/source/dialogs/restartdialog.cxx   |   78 +++
 svtools/source/java/javaerror.src  |   13 ---
 svtools/source/java/javainteractionhandler.cxx |   13 +--
 svtools/uiconfig/ui/restartdialog.ui   |  102 +
 12 files changed, 237 insertions(+), 33 deletions(-)

New commits:
commit 872d76228fc440d22924b69a391f027dbdc8e693
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Nov 27 12:40:15 2012 +0100

Introduce a Restart dialog that allows to automatically restart LO

...instead of just telling the user to restart manually.

The one existing dialog (duplicated into svtools and cui) that got replaced 
by
this is the dialog asking to restart when the choice of JVM changed.  There 
are
more similar dialogs that would benefit from replacing them, like
RID_SVX_MSGBOX_OPTIONS_RESTART (cui/source/options/optjava.src), but that 
one is
called when closing a dialog nested within the Options dialog, and calling
OfficeRestartManger.requestRestart in such a nested situation still leads 
to a
crash.

The design idea is that when more similar dialogs are replaced, 
restartdialog.ui
contains a list of hidden GtkLables with the appropriate prose why a 
restart is
required in the given case, and restartdialog.hxx's RestartReason enum 
contains
corresponding values that will show exactly one of those GtkLables.

The new svtools/uiconfig/ui/restartdialog.ui is probably still pretty rough 
and
could benefit from some UX love.

Change-Id: Id939188ee22f24301a8a3598b83afb31339bded5

diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index c497fda..1e14f82 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -24,7 +24,7 @@
 
 // Resource-Id's 
 
-#define RID_SVX_MSGBOX_JAVA_RESTART (RID_SVX_START + 0)
+// RID_SVX_START + 0 unused
 #define RID_SVX_MSGBOX_OPTIONS_RESTART  (RID_SVX_START + 1)
 #define RID_SVX_MSGBOX_LANGUAGE_RESTART (RID_SVX_START + 2)
 #define RID_CUI_DIALOG_COLORPICKER  (RID_SVX_START + 3)
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 32d9441..821bb92 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -32,6 +32,7 @@
 #include vcl/waitobj.hxx
 #include unotools/pathoptions.hxx
 #include svtools/imagemgr.hxx
+#include svtools/restartdialog.hxx
 #include svtools/treelistentry.hxx
 #include sfx2/filedlghelper.hxx
 #include comphelper/processfactory.hxx
@@ -662,8 +663,9 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet 
/*rCoreSet*/ )
 if ( bRunning ||
 ( ( pInfo-nRequirements  JFW_REQUIRE_NEEDRESTART ) 
== JFW_REQUIRE_NEEDRESTART ) )
 {
-WarningBox aWarnBox( this, CUI_RES( 
RID_SVX_MSGBOX_JAVA_RESTART ) );
-aWarnBox.Execute();
+svtools::executeRestartDialog(
+comphelper::getProcessComponentContext(), this,
+svtools::RESTART_REASON_JAVA);
 }
 
 eErr = jfw_setSelectedJRE( pInfo );
diff --git a/cui/source/options/optjava.src b/cui/source/options/optjava.src
index 77cd195..4ee2751 100644
--- a/cui/source/options/optjava.src
+++ b/cui/source/options/optjava.src
@@ -290,13 +290,6 @@ ErrorBox RID_SVXERR_JRE_FAILED_VERSION
 Message [ en-US ] = The Java runtime environment you selected is not the 
required version.\nPlease select a different folder. ;
 };
 
-WarningBox RID_SVX_MSGBOX_JAVA_RESTART
-{
-BUTTONS = WB_OK ;
-DEFBUTTON = WB_DEF_OK ;
-Message [ en-US ] = For the selected Java runtime environment to work 
properly, %PRODUCTNAME must be restarted.\nPlease restart %PRODUCTNAME now. ;
-};
-
 WarningBox RID_SVX_MSGBOX_OPTIONS_RESTART
 {
 BUTTONS = WB_OK ;
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index fd81beb..7ed5a70 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -130,6 +130,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
 svtools/source/dialogs/mcvmath \
 svtools/source/dialogs/PlaceEditDialog \
 svtools/source/dialogs/prnsetup \
+svtools/source/dialogs/restartdialog \
 svtools/source/dialogs/roadmapwizard \
 svtools/source/dialogs/ServerDetailsControls \
 svtools/source/dialogs/wizardmachine \
diff 

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optgdlg.src |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8ca933ae8af6656b2f23fe3a2fa17b2034d5c615
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Sat Nov 24 10:36:57 2012 +0300

Fix the Ignore system input language label truncated

This fix label Ignore system input language truncated on
Options-Language Setting-Languages dialog

Change-Id: Iaa9606160d7cfc96fcbb02116020cd8d46ffb4e7
Reviewed-on: https://gerrit.libreoffice.org/1155
Reviewed-by: Eike Rathke er...@redhat.com
Tested-by: Eike Rathke er...@redhat.com

diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 41ce88c..89f7124 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -660,14 +660,14 @@ TabPage OFA_TP_LANGUAGES
 CheckBox CB_CTLSUPPORT
 {
 HelpID = cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT;
-Pos = MAP_APPFONT ( 12 , 188-10 ) ;
+Pos = MAP_APPFONT ( 12 , 188-11 ) ;
 Size = MAP_APPFONT ( 236 , RSC_CD_CHECKBOX_HEIGHT ) ;
 Text [ en-US ] = Show UI elements for B~i-Directional writing;
 };
 CheckBox CB_IGNORE_LANG_CHANGE
 {
 HelpID = cui:CheckBox:OFA_TP_LANGUAGES:CB_IGNORE_LANG_CHANGE;
-Pos = MAP_APPFONT ( 12 , 188-11+15 ) ;
+Pos = MAP_APPFONT ( 12 , 188-11+13 ) ;
 Size = MAP_APPFONT ( 125 , 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

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/certpath.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3bdd04fc0466154e16243cf233fb2bb3ad4043a0
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Nov 26 17:35:15 2012 +0100

Improve error reporting

Change-Id: I46e97b59716e5d716ac5d76a0bd6af5eea05a57f

diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 95709ac..e567260 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -253,9 +253,9 @@ IMPL_LINK_NOARG(CertPathDialog, AddHdl_Impl)
 AddCertPath(m_sManual, aPath);
 }
 }
-catch (const uno::Exception)
+catch (uno::Exception  e)
 {
-SAL_WARN( cui.options, CertPathDialog::AddHdl_Impl(): caught 
exception );
+SAL_WARN(cui.options, caught UNO exception:   e.Message);
 }
 
 return 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optlingu.cxx |   10 --
 cui/source/options/optlingu.hrc |1 -
 cui/source/options/optlingu.src |4 
 3 files changed, 15 deletions(-)

New commits:
commit 0ab3d629c7f921088a03741377bbe031bedc9ba9
Author: László Németh nem...@numbertext.org
Date:   Sat Nov 24 17:16:55 2012 +0100

fdo#57483 remove check capitalization (ugly 1980 thing)

Change-Id: I9a18e463c1eac01bc855e0b4826599e25692d441

diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index d63a137..24a9443 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -347,7 +347,6 @@ enum EID_OPTIONS
 EID_GRAMMAR_AUTO,
 EID_CAPITAL_WORDS,
 EID_WORDS_WITH_DIGITS,
-EID_CAPITALIZATION,
 EID_SPELL_SPECIAL,
 EID_NUM_MIN_WORDLEN,
 EID_NUM_PRE_BREAK,
@@ -364,7 +363,6 @@ static const char * aEidToPropName[] =
 UPN_IS_GRAMMAR_AUTO,// EID_GRAMMAR_AUTO
 UPN_IS_SPELL_UPPER_CASE,// EID_CAPITAL_WORDS
 UPN_IS_SPELL_WITH_DIGITS,   // EID_WORDS_WITH_DIGITS
-UPN_IS_SPELL_CAPITALIZATION,// EID_CAPITALIZATION
 UPN_IS_SPELL_SPECIAL,   // EID_SPELL_SPECIAL
 UPN_HYPH_MIN_WORD_LENGTH,   // EID_NUM_MIN_WORDLEN,
 UPN_HYPH_MIN_LEADING,   // EID_NUM_PRE_BREAK
@@ -1068,7 +1066,6 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
 aMoreDictsLink  ( this, CUI_RES( FT_LINGU_OPTIONS_MOREDICTS ) ),
 sCapitalWords   ( CUI_RES( STR_CAPITAL_WORDS ) ),
 sWordsWithDigits( CUI_RES( STR_WORDS_WITH_DIGITS ) ),
-sCapitalization ( CUI_RES( STR_CAPITALIZATION ) ),
 sSpellSpecial   ( CUI_RES( STR_SPELL_SPECIAL ) ),
 sSpellAuto  ( CUI_RES( STR_SPELL_AUTO ) ),
 sGrammarAuto( CUI_RES( STR_GRAMMAR_AUTO ) ),
@@ -1501,13 +1498,6 @@ void SvxLinguTabPage::Reset( const SfxItemSet rSet )
 pModel-Insert( pEntry );
 lcl_SetCheckButton( pEntry, bVal );
 
-pEntry = CreateEntry( sCapitalization,  CBCOL_FIRST );
-aLngCfg.GetProperty( UPN_IS_SPELL_CAPITALIZATION ) = bVal;
-nUserData = OptionsUserData( EID_CAPITALIZATION, sal_False, 0, sal_True, 
bVal).GetUserData();
-pEntry-SetUserData( (void *)nUserData );
-pModel-Insert( pEntry );
-lcl_SetCheckButton( pEntry, bVal );
-
 pEntry = CreateEntry( sSpellSpecial,CBCOL_FIRST );
 aLngCfg.GetProperty( UPN_IS_SPELL_SPECIAL ) = bVal;
 nUserData = OptionsUserData( EID_SPELL_SPECIAL, sal_False, 0, sal_True, 
bVal).GetUserData();
diff --git a/cui/source/options/optlingu.hrc b/cui/source/options/optlingu.hrc
index ec9032f..6326629 100644
--- a/cui/source/options/optlingu.hrc
+++ b/cui/source/options/optlingu.hrc
@@ -29,7 +29,6 @@
 
 #define STR_CAPITAL_WORDS   201
 #define STR_WORDS_WITH_DIGITS   202
-#define STR_CAPITALIZATION  203
 #define STR_SPELL_SPECIAL   204
 #define STR_SPELL_AUTO  206
 #define STR_NUM_PRE_BREAK   209
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index 700b85a..d8f4252 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -297,10 +297,6 @@ TabPage RID_SFXPAGE_LINGU
 {
 Text [ en-US ] = Check words with numbers ;
 };
-String STR_CAPITALIZATION
-{
-Text [ en-US ] = Check capitalization;
-};
 String STR_SPELL_SPECIAL
 {
 Text [ en-US ] = Check special regions;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/dialogs/about.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d4181e5b54577c4bda025d447aeb08d9b0e441af
Author: Jean-Baptiste FAURE jbf.fa...@orange.fr
Date:   Sat Nov 24 21:17:15 2012 +0100

Allow the version number to be on 2 lines in the About dialog

Change-Id: I641c668b0ced2564039ed1e3f2469cf4d220de5f

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 1c28e53..0e13ca9 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -235,9 +235,11 @@ void AboutDialog::LayoutControls()
 sal_Int32 aLogoVersionSpacing = aLogoSize.Height() * 0.15;
 Point aVersionPos( aDialogBorder,
aLogoPos.Y() + aLogoSize.Height() + aLogoVersionSpacing 
);
-Size aVersionSize = aVersionText.CalcMinimumSize();
+Size aVersionSize = aVersionText.GetSizePixel();
 aVersionSize.Width() = aIdealTextWidth;
 aVersionText.SetPosSizePixel( aVersionPos, aVersionSize );
+aVersionSize = aVersionText.CalcMinimumSize();
+aVersionText.SetSizePixel( aVersionSize );
 
 // Position description text
 sal_Int32 aVersionDescriptionSpacing = aLogoSize.Height() * 0.45;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

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

New commits:
commit 5eb9c58c31ac0ab1042ef1c2cc8b61e932dddf8d
Author: Rob Snelders programm...@ertai.nl
Date:   Tue Nov 13 23:29:12 2012 +0100

fdo#56726 - HTML Compatibility for obsolete Netscape Navigator

Change-Id: I51cc07d45bd285a5e6806467d10ce758189d0de6
Reviewed-on: https://gerrit.libreoffice.org/1051
Reviewed-by: Michael Meeks michael.me...@suse.com
Tested-by: Michael Meeks michael.me...@suse.com

diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src
index 4aaf51f..23449e3 100644
--- a/cui/source/options/opthtml.src
+++ b/cui/source/options/opthtml.src
@@ -240,7 +240,7 @@ TabPage RID_OFAPAGE_HTMLOPT
 StringList =
 {
  Microsoft Internet Explorer ;  ;
- Netscape Navigator;  ;
+ Mozilla Firefox;  ;
  %PRODUCTNAME Writer ;  ;
 };
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source sfx2/source starmath/source svtools/source svx/source toolkit/source

[Libreoffice Gerrit user]

 cui/source/dialogs/postdlg.cxx|   14 +++---
 cui/source/options/optgdlg.cxx|6 ++
 cui/source/tabpages/tabstpge.cxx  |4 ++--
 sfx2/source/appl/appserv.cxx  |1 -
 sfx2/source/dialog/dinfdlg.cxx|   22 +++---
 sfx2/source/dialog/versdlg.cxx|   11 ---
 sfx2/source/inc/versdlg.hxx   |1 -
 starmath/source/unomodel.cxx  |4 ++--
 svtools/source/contnr/DocumentInfoPreview.cxx |6 +++---
 svx/source/dialog/_contdlg.cxx|8 
 svx/source/dialog/compressgraphicdialog.cxx   |4 ++--
 svx/source/dialog/imapdlg.cxx |8 
 svx/source/form/formcontroller.cxx|   11 +--
 toolkit/source/controls/unocontrolmodel.cxx   |1 +
 14 files changed, 51 insertions(+), 50 deletions(-)

New commits:
commit 1b329fd5ccc0ff270d776dfd03571da3f4d6f34d
Author: Eike Rathke er...@redhat.com
Date:   Thu Nov 22 19:48:13 2012 +0100

get rid of unnecessary LocaleDataWrapper temporary instances

Change-Id: I17d9a502565d445b0eab9ef6e9123661850292b7

diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 90fe48c..7a944e2 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -124,8 +124,8 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
 }
 else
 {
-LocaleDataWrapper aLocaleWrapper( 
Application::GetSettings().GetLanguageTag().getLocale() );
-aDateStr = aLocaleWrapper.getDate( Date( Date::SYSTEM ) );
+const LocaleDataWrapper rLocaleWrapper( 
Application::GetSettings().GetLocaleDataWrapper() );
+aDateStr = rLocaleWrapper.getDate( Date( Date::SYSTEM ) );
 }
 
 nWhich = rSet.GetPool()-GetWhich( SID_ATTR_POSTIT_TEXT );
@@ -212,7 +212,7 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
 Date aDate( Date::SYSTEM );
 Time aTime( Time::SYSTEM );
 String aTmp( SvtUserOptions().GetID() );
-LocaleDataWrapper aLocaleWrapper( 
Application::GetSettings().GetLanguageTag().getLocale() );
+const LocaleDataWrapper rLocaleWrapper( 
Application::GetSettings().GetLocaleDataWrapper() );
 String aStr( aEditED.GetText() );
 aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( \n  ) );
 
@@ -221,9 +221,9 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
 aStr += aTmp;
 aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ,  ) );
 }
-aStr += aLocaleWrapper.getDate(aDate);
+aStr += rLocaleWrapper.getDate(aDate);
 aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ,  ) );
-aStr += aLocaleWrapper.getTime(aTime, sal_False, sal_False);
+aStr += rLocaleWrapper.getTime(aTime, sal_False, sal_False);
 aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM(  \n ) );
 
 aStr = convertLineEnd(aStr, GetSystemLineEnd());
@@ -239,11 +239,11 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
 
 IMPL_LINK_NOARG(SvxPostItDialog, OKHdl)
 {
-LocaleDataWrapper aLocaleWrapper( 
Application::GetSettings().GetLanguageTag().getLocale() );
+const LocaleDataWrapper rLocaleWrapper( 
Application::GetSettings().GetLocaleDataWrapper() );
 pOutSet = new SfxItemSet( rSet );
 pOutSet-Put( SvxPostItAuthorItem( SvtUserOptions().GetID(),
  rSet.GetPool()-GetWhich( 
SID_ATTR_POSTIT_AUTHOR ) ) );
-pOutSet-Put( SvxPostItDateItem( aLocaleWrapper.getDate( Date( 
Date::SYSTEM ) ),
+pOutSet-Put( SvxPostItDateItem( rLocaleWrapper.getDate( Date( 
Date::SYSTEM ) ),
  rSet.GetPool()-GetWhich( 
SID_ATTR_POSTIT_DATE ) ) );
 pOutSet-Put( SvxPostItTextItem( aEditED.GetText(),
  rSet.GetPool()-GetWhich( 
SID_ATTR_POSTIT_TEXT ) ) );
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 38d050d..f4d8aba 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1696,10 +1696,8 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet rSet )
 OUString aDatePatternsString = 
pLangConfig-aSysLocaleOptions.GetDatePatternsConfigString();
 if (aDatePatternsString.isEmpty())
 {
-Locale aTempLocale;
-SvxLanguageToLocale( aTempLocale, 
Application::GetSettings().GetLanguageTag().getLanguageType());
-LocaleDataWrapper aLocaleWrapper( aTempLocale );
-aDatePatternsString = lcl_getDatePatternsConfigString( aLocaleWrapper);
+const LocaleDataWrapper rLocaleWrapper( 
Application::GetSettings().GetLocaleDataWrapper() );
+aDatePatternsString = lcl_getDatePatternsConfigString( rLocaleWrapper);
 }
 aDatePatternsED.SetText( aDatePatternsString);
 bReadonly = 
pLangConfig-aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_DATEPATTERNS);
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index d0d429b..ef6d44b 100644
--- 

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optgdlg.cxx |   15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 4d79f55efd042cacfe252758228f8813552b4cbb
Author: Eike Rathke er...@redhat.com
Date:   Sat Nov 17 02:39:59 2012 +0100

use LanguageTag

Change-Id: I4f49c5ada6b9dfb8fe143157470e7d73e04c3354

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 006be93..2bf4f0e 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -30,6 +30,7 @@
 #include vcl/msgbox.hxx
 #include vcl/mnemonic.hxx
 #include i18npool/mslangid.hxx
+#include i18npool/languagetag.hxx
 #include unotools/compatibility.hxx
 #include unotools/useroptions.hxx
 #include unotools/fontoptions.hxx
@@ -1255,7 +1256,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 LanguageType aLang = LANGUAGE_DONTKNOW;
 for (sal_IntPtr i=0; iseqInstalledLanguages.getLength(); i++)
 {
-aLang = 
MsLangId::convertIsoStringToLanguage(seqInstalledLanguages[i]);
+aLang = LanguageTag(seqInstalledLanguages[i]).getLanguageType();
 if (aLang != LANGUAGE_DONTKNOW)
 {
 //sal_uInt16 p = aUserInterfaceLB.InsertLanguage(aLang);
@@ -1551,7 +1552,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet 
rSet )
 if(!bCurrentDocCBChecked)
 {
 Any aValue;
-Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, 
false );
+Locale aLocale = LanguageTag( eSelectLang).getLocale( false );
 aValue = aLocale;
 OUString aPropName( DefaultLocale );
 pLangConfig-aLinguConfig.SetProperty( aPropName, aValue );
@@ -1571,7 +1572,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet 
rSet )
 if(!bCurrentDocCBChecked)
 {
 Any aValue;
-Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, 
false );
+Locale aLocale = LanguageTag( eSelectLang).getLocale( false );
 aValue = aLocale;
 OUString aPropName( DefaultLocale_CJK );
 pLangConfig-aLinguConfig.SetProperty( aPropName, aValue );
@@ -1591,7 +1592,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet 
rSet )
 if(!bCurrentDocCBChecked)
 {
 Any aValue;
-Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, 
false );
+Locale aLocale = LanguageTag( eSelectLang).getLocale( false );
 aValue = aLocale;
 OUString aPropName( DefaultLocale_CTL );
 pLangConfig-aLinguConfig.SetProperty( aPropName, aValue );
@@ -1724,17 +1725,17 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet rSet 
)
 Locale aLocale;
 aWestLang = aLocale;
 
-eCurLang = MsLangId::convertLocaleToLanguage( aLocale );
+eCurLang = LanguageTag( aLocale ).getLanguageType( false);
 
 aCJKLang = pLangConfig-aLinguConfig.GetProperty(DefaultLocale_CJK);
 aLocale = Locale();
 aCJKLang = aLocale;
-eCurLangCJK = MsLangId::convertLocaleToLanguage( aLocale );
+eCurLangCJK = LanguageTag( aLocale ).getLanguageType( false);
 
 aCTLLang = pLangConfig-aLinguConfig.GetProperty(DefaultLocale_CTL);
 aLocale = Locale();
 aCTLLang = aLocale;
-eCurLangCTL = MsLangId::convertLocaleToLanguage( aLocale );
+eCurLangCTL = LanguageTag( aLocale ).getLanguageType( false);
 }
 catch (const Exception)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/chardlg.cxx |   14 +++---
 cui/source/tabpages/grfpage.cxx |   15 ---
 2 files changed, 15 insertions(+), 14 deletions(-)

New commits:
commit 752cb97a8fb189b6e11d3a55704222b9aba1b11a
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Fri Nov 2 15:56:05 2012 -0200

fdo#38838 UniString removal

Change-Id: I7bf9b0e94bff9047544f6aba9669b8e0a3d3a2a5
Reviewed-on: https://gerrit.libreoffice.org/971
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 62b539c..80ebc32 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -3250,13 +3250,13 @@ void SvxCharPositionPage::FillUserData()
 {
 const sal_Unicode cTok = ';';
 
-String sUser( UniString::CreateFromInt32( m_nSuperEsc ) );
-sUser.Append( cTok );
-sUser.Append( UniString::CreateFromInt32( m_nSubEsc ) );
-sUser.Append( cTok );
-sUser.Append( UniString::CreateFromInt32( m_nSuperProp ) );
-sUser.Append( cTok );
-sUser.Append( UniString::CreateFromInt32( m_nSubProp ) );
+OUString sUser( OUString::valueOf( m_nSuperEsc ) );
+sUser += OUString( cTok );
+sUser += OUString::valueOf( m_nSubEsc );
+sUser += OUString (cTok );
+sUser += OUString::valueOf( m_nSuperProp );
+sUser += OUString ( cTok );
+sUser += OUString::valueOf( m_nSubProp );
 SetUserData( sUser );
 }
 
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 2297dd8..60ae1da 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -29,6 +29,7 @@
 #include grfpage.hxx
 #include svx/grfcrop.hxx
 #include grfpage.hrc
+#include rtl/ustring.hxx
 #include cuires.hrc
 #include svx/dialogs.hrc // for RID_SVXPAGE_GRFCROP
 
@@ -663,10 +664,10 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
 aFld.SetMax( LONG_MAX - 1 );
 
 aFld.SetValue( aFld.Normalize( aOrigSize.Width() ), eUnit );
-String sTemp = aFld.GetText();
+OUString sTemp = aFld.GetText();
 aFld.SetValue( aFld.Normalize( aOrigSize.Height() ), eUnit );
 // multiplication sign (U+00D7)
-sTemp += UniString(\xc3\x97, RTL_TEXTENCODING_UTF8);
+sTemp += OUString( sal_Unicode (0x00D7) );
 sTemp += aFld.GetText();
 
 if ( aOrigPixelSize.Width()  aOrigPixelSize.Height() ) {
@@ -674,14 +675,14 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
 ((float)aOrigSize.Width()/TWIP_TO_INCH)+0.5));
  int ay = int(floor((float)aOrigPixelSize.Height() /
 ((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5));
- sTemp += rtl::OUString( );
+ sTemp += OUString( );
  sTemp += CUI_RESSTR( STR_PPI );
- String sPPI = UniString::CreateFromInt32(ax);
+ OUString sPPI = OUString::valueOf(ax);
  if (abs(ax - ay)  1) {
-sPPI += UniString(\xc3\x97, RTL_TEXTENCODING_UTF8);
-sPPI += UniString::CreateFromInt32(ay);
+sPPI += OUString( sal_Unicode (0x00D7) );
+sPPI += OUString::valueOf(ay);
  }
- sTemp.SearchAndReplaceAscii(%1, sPPI);
+ sTemp.replaceAll(%1, sPPI);
 }
 aOrigSizeFT.SetText( sTemp );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/chardlg.cxx |8 
 cui/source/tabpages/grfpage.cxx |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 5b1fcd5262f087e3d1cabb240d1761064baeafc6
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Nov 14 16:38:30 2012 +

replaceAll returns a new replaced string but leaves the original alone

Change-Id: I79ef3158d520d2c328838e83ad8382483be332a8

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 80ebc32..4beeaeb 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -3250,13 +3250,13 @@ void SvxCharPositionPage::FillUserData()
 {
 const sal_Unicode cTok = ';';
 
-OUString sUser( OUString::valueOf( m_nSuperEsc ) );
+OUString sUser( OUString::valueOf( static_castsal_Int32(m_nSuperEsc)) );
 sUser += OUString( cTok );
-sUser += OUString::valueOf( m_nSubEsc );
+sUser += OUString::valueOf( static_castsal_Int32(m_nSubEsc) );
 sUser += OUString (cTok );
-sUser += OUString::valueOf( m_nSuperProp );
+sUser += OUString::valueOf( static_castsal_Int32(m_nSuperProp) );
 sUser += OUString ( cTok );
-sUser += OUString::valueOf( m_nSubProp );
+sUser += OUString::valueOf( static_castsal_Int32(m_nSubProp) );
 SetUserData( sUser );
 }
 
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 60ae1da..1d3694b 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -671,9 +671,9 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
 sTemp += aFld.GetText();
 
 if ( aOrigPixelSize.Width()  aOrigPixelSize.Height() ) {
- int ax = int(floor((float)aOrigPixelSize.Width() /
+ sal_Int32 ax = sal_Int32(floor((float)aOrigPixelSize.Width() /
 ((float)aOrigSize.Width()/TWIP_TO_INCH)+0.5));
- int ay = int(floor((float)aOrigPixelSize.Height() /
+ sal_Int32 ay = sal_Int32(floor((float)aOrigPixelSize.Height() /
 ((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5));
  sTemp += OUString( );
  sTemp += CUI_RESSTR( STR_PPI );
@@ -682,7 +682,7 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
 sPPI += OUString( sal_Unicode (0x00D7) );
 sPPI += OUString::valueOf(ay);
  }
- sTemp.replaceAll(%1, sPPI);
+ sTemp = sTemp.replaceAll(%1, sPPI);
 }
 aOrigSizeFT.SetText( sTemp );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/tabpages/page.src |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8c004e70aa44910d28d27e0b4cf837b3bbb85c5c
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Wed Nov 14 08:03:36 2012 +0300

fdo#42558 Re-adding the None option to the page numbering

Change-Id: Iedb239232854f185ea0005f745356800788cf0fb

diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 4504b69..4abc5bc 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -300,6 +300,7 @@ TabPage RID_SVXPAGE_PAGE
  a, b, c, ... ;  1/*SVX_NUM_CHARS_LOWER_LETTER  */; 
 ;
  I, II, III, ... ;  2/*SVX_NUM_ROMAN_UPPER */; 
 ;
  i, ii, iii, ... ;  3/*SVX_NUM_ROMAN_LOWER */; 
 ;
+ None ;  5/*SVX_NUM_NUMBER_NONE */; 
 ;
  A, .., AA, .., AAA, ... ;  9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; 
 ;
  a, .., aa, .., aaa, ... ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; 
 ;
  Native Numbering ;  12 /*NATIVE_NUMBERING  
 */;  ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

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

New commits:
commit 09ee17974f31ca188df532a2fea33a79ca367ebe
Author: Stephan Bergmann sberg...@redhat.com
Date:   Tue Nov 13 14:33:01 2012 +0100

Fix Which-ID range of OfaTreeOptionsDialog item set

...by properly re-merging
http://svn.apache.org/viewvc?view=revisionrevision=1172345 cws
mba34issues01: #i117716#: fix missing resources my removing unused code
(changing the start ID from SID_OPTIONS_START to SID_INET_EMAIL_NAME) 
brought in
by 015b29b74aaf16f5bdf6a90f6e7d5c1d210fe281 re-base on ALv2 code (but
erroneously dropping the start ID) with 
5fcecf9b88a0879081d8239cebbc03e30150985a
hrc cleanup: Remove unused defines (removing unused SID_INET_EMAIL_NAME).

Change-Id: I3f10b5ec166a8bf4763ef8e44d3095bb816277d0

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index b0ed3a3..79eabdf 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1271,7 +1271,7 @@ SfxItemSet* OfaTreeOptionsDialog::CreateItemSet( 
sal_uInt16 nId )
 pRet = new SfxItemSet( SFX_APP()-GetPool(),
 SID_BASIC_ENABLED, SID_BASIC_ENABLED,
 //SID_OPTIONS_START - ..END
-SID_INET_PROXY_PORT,
+SID_INET_PROXY_TYPE, SID_INET_PROXY_PORT,
 SID_SAVEREL_INET, SID_SAVEREL_FSYS,
 SID_INET_SMTPSERVER, SID_INET_SMTPSERVER,
 SID_INET_NOPROXY, SID_INET_SOCKS_PROXY_PORT,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source officecfg/registry sw/source unotools/inc unotools/source

[Libreoffice Gerrit user]

 cui/source/options/optgdlg.cxx |   10 +++
 cui/source/options/optgdlg.hrc |1 
 cui/source/options/optgdlg.hxx |1 
 cui/source/options/optgdlg.src |   69 +++--
 officecfg/registry/schema/org/openoffice/Setup.xcs |8 ++
 sw/source/ui/docvw/edtwin.cxx  |   12 +++
 unotools/inc/unotools/syslocaleoptions.hxx |6 +
 unotools/source/config/syslocaleoptions.cxx|   62 +-
 8 files changed, 135 insertions(+), 34 deletions(-)

New commits:
commit b4d1aaa074e2be9fd778134c40f99d2ab8a01e93
Author: Jeremy Brown jeremy.r.br...@gmail.com
Date:   Sun Nov 11 08:06:46 2012 +0100

fdo#36324 fdo#42929 - option to ingore system input language changes

Created a new checkbox on the Langauges options page:
[] Ignore system input language

This is unchecked by default so that the current behavior remains the
default, i.e. newly entered text will be flagged as whatever the
current system input language is.

When checked however, this instructs LibreOffice to ignore the system
language (on Windows for example, the language from the Language Bar)
when determining the language for newly entered text. This is handled in
the lcl_isNonDefaultLanguage method of sw/source/ui/docvw/edtwin.cxx.

The option is also saved in registrymodifications.xcu

There are two main use cases:
1. This allows someone to use a single international keyboard on
Windows to type in multiple languages, (e.g. English, French, Spanish)
without changing the system keyboard. The person is then responsible for
setting the language for each word or run of text themselves in
LibreOffice. This seems to be the preferred workflow for some
translators and some educators developing language materials.

2. This allows someone writing in a minority language that is not
represented in one of Windows' locale options to still be able to type
in LibreOffice in their language using a keyboard tagged for another
language. Once they set the language in LibreOffice (e.g. to Teke-Eboo
[ebo_CG]), they can type with a keyboard as being for Swahili but
still succeed in entering new text in their language. This allows
spell-checking to work properly without them having to select each new
word they enter and reset the language of that word to Teke-Eboo (as is
currently the case).

Change-Id: I86248f5865b69048eb1f3e427a8c03b093138796
Reviewed-on: https://gerrit.libreoffice.org/1029
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 6567e7b..84a8d3e 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1222,6 +1222,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 aAsianSupportCB(this,   CUI_RES(CB_ASIANSUPPORT   )),
 aCTLSupportFI(this, CUI_RES(FI_CTLSUPPORT)),
 aCTLSupportCB(this, CUI_RES(CB_CTLSUPPORT   )),
+aIgnoreLanguageChangeCB(this, CUI_RES(CB_IGNORE_LANG_CHANGE   )),
 sDecimalSeparatorLabel(aDecimalSeparatorCB.GetText()),
 pLangConfig(new LanguageConfig_Impl)
 {
@@ -1347,6 +1348,8 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 aCTLSupportCB.Enable(!bReadonly);
 aCTLSupportFI.Show(bReadonly);
 SupportHdl( aCTLSupportCB );
+
+aIgnoreLanguageChangeCB.Check( 
pLangConfig-aSysLocaleOptions.IsIgnoreLanguageChange() );
 }
 
 OfaLanguagesTabPage::~OfaLanguagesTabPage()
@@ -1514,6 +1517,9 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet 
rSet )
 if(aDecimalSeparatorCB.GetSavedValue() != aDecimalSeparatorCB.IsChecked())
 
pLangConfig-aSysLocaleOptions.SetDecimalSeparatorAsLocale(aDecimalSeparatorCB.IsChecked());
 
+if(aIgnoreLanguageChangeCB.GetSavedValue() != 
aIgnoreLanguageChangeCB.IsChecked())
+
pLangConfig-aSysLocaleOptions.SetIgnoreLanguageChange(aIgnoreLanguageChangeCB.IsChecked());
+
 // Configured currency, for example, USD-en-US or EUR-de-DE, or empty for 
locale default.
 OUString sOldCurr = 
pLangConfig-aSysLocaleOptions.GetCurrencyConfigString();
 sal_uInt16 nCurrPos = aCurrencyLB.GetSelectEntryPos();
@@ -1659,6 +1665,9 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet rSet )
 aDecimalSeparatorCB.Check( 
pLangConfig-aSysLocaleOptions.IsDecimalSeparatorAsLocale());
 aDecimalSeparatorCB.SaveValue();
 
+aIgnoreLanguageChangeCB.Check( 
pLangConfig-aSysLocaleOptions.IsIgnoreLanguageChange());
+aIgnoreLanguageChangeCB.SaveValue();
+
 // let LocaleSettingHdl enable/disable checkboxes for CJK/CTL support
 // #i15812# must be done *before* the configured currency is set
 // and update the decimal separator used for the given locale
@@ 

[Libreoffice-commits] .: cui/source desktop/source sd/source sfx2/source svtools/inc svtools/Library_svt.mk svtools/Package_inc.mk svtools/source toolkit/inc toolkit/Library_tk.mk toolkit/Package_inc.

[Libreoffice Gerrit user]

 cui/source/dialogs/SpellDialog.cxx|4 
 cui/source/inc/SpellDialog.hxx|   10 -
 cui/source/inc/about.hxx  |1 
 cui/source/inc/optlingu.hxx   |6 
 desktop/source/deployment/gui/dp_gui_dialog2.cxx  |6 
 desktop/source/deployment/gui/dp_gui_dialog2.hxx  |8 -
 desktop/source/deployment/gui/dp_gui_extlistbox.cxx   |2 
 desktop/source/deployment/gui/dp_gui_extlistbox.hxx   |6 
 desktop/source/deployment/gui/dp_gui_updatedialog.cxx |2 
 desktop/source/deployment/gui/dp_gui_updatedialog.hxx |   14 -
 sd/source/ui/dlg/RemoteDialogClientBox.hxx|1 
 sfx2/source/dialog/basedlgs.cxx   |1 
 svtools/Library_svt.mk|1 
 svtools/Package_inc.mk|1 
 svtools/inc/svtools/fixedhyper.hxx|  133 --
 svtools/inc/svtools/templdlg.hxx  |4 
 svtools/source/control/fixedhyper.cxx |  133 --
 svtools/source/uno/unoiface.cxx   |4 
 toolkit/Library_tk.mk |1 
 toolkit/Package_inc.mk|1 
 toolkit/inc/toolkit/helper/fixedhyperbase.hxx |   50 --
 toolkit/source/awt/vclxwindows.cxx|   14 -
 toolkit/source/helper/fixedhyperbase.cxx  |   63 
 vcl/Library_vcl.mk|1 
 vcl/Package_inc.mk|1 
 vcl/inc/vcl/fixedhyper.hxx|  127 +
 vcl/source/control/fixedhyper.cxx |  133 ++
 vcl/source/window/builder.cxx |3 
 28 files changed, 305 insertions(+), 426 deletions(-)

New commits:
commit 040e022d06ecadc36d3ef5c52178095a4d2c828a
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Nov 10 23:22:47 2012 +

move svtools's FixedHyper.hxx to vcl

merge with fixedhyperbase and map GtkLinkButton
to FixedHyper. Convert to String while I'm at it.

Change-Id: Ibc61fd29c01796561eeef952a159c82ff215a095

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 54f94cf..b5ba380 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -420,7 +420,7 @@ void SpellDialog::UpdateBoxes_Impl()
 }
 else
 {
-bool bHasExplainLink = aExplainLink.GetURL().Len() != 0;
+bool bHasExplainLink = !aExplainLink.GetURL().isEmpty();
 aExplainLink.Show( bHasExplainLink );
 
 sal_Int32 nExplainWidth = aExplainLink.GetPosPixel().X() - 
aExplainFT.GetPosPixel().X();
@@ -2156,7 +2156,7 @@ void  SentenceEditWindow_Impl::SetUndoEditMode(bool bSet)
 pSpellDialog-aChangePB.Enable();
 }
 
-IMPL_LINK( SpellDialog, HandleHyperlink, svt::FixedHyperlink*, pHyperlink )
+IMPL_LINK( SpellDialog, HandleHyperlink, FixedHyperlink*, pHyperlink )
 {
 rtl::OUString sURL=pHyperlink-GetURL();
 rtl::OUString sTitle=GetText();
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index b2a9f94..4161407 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -36,7 +36,7 @@
 #include memory
 #include svtools/svmedit.hxx
 #include svl/lstner.hxx
-#include svtools/fixedhyper.hxx
+#include vcl/fixedhyper.hxx
 #include vcl/xtextedt.hxx
 #include editeng/SpellPortions.hxx
 
@@ -137,10 +137,10 @@ private:
 FixedText   aLanguageFT;
 SvxLanguageBox  aLanguageLB;
 
-HelpFixedText   aExplainFT;
-svt::FixedHyperlink aExplainLink;
+HelpFixedText   aExplainFT;
+FixedHyperlink  aExplainLink;
 
-FixedText   aNotInDictFT;
+FixedText   aNotInDictFT;
 SentenceEditWindow_Impl  aSentenceED;
 
 FixedText   aSuggestionFT;
@@ -201,7 +201,7 @@ private:
 DECL_LINK( AddToDictClickHdl, PushButton* );
 DECL_LINK( LanguageSelectHdl, SvxLanguageBox* );
 DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
-DECL_LINK( HandleHyperlink, svt::FixedHyperlink * );
+DECL_LINK( HandleHyperlink, FixedHyperlink * );
 
 DECL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog * );
 
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 28e2fa5..4f824e3 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -23,7 +23,6 @@
 #include vcl/accel.hxx
 #include svtools/svmedit.hxx
 #include svtools/stdctrl.hxx
-#include svtools/fixedhyper.hxx
 #include sfx2/basedlgs.hxx/// for SfxModalDialog
 #include vector
 
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 75e4b12..b870f61 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -23,7 +23,7 @@
 #include vcl/fixed.hxx
 #include vcl/toolbox.hxx
 #include vcl/field.hxx
-#include 

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/dialogs/cuifmsearch.cxx |   18 +-
 cui/source/inc/cuifmsearch.hxx |2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit b524b0bd98e4f841c88b91bff4bd23e68897a501
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Fri Nov 2 14:46:30 2012 -0200

fdo#38838 UniString removal

Change-Id: Id1a17001caa0f6350de10d8af016630f4c76a55b
Reviewed-on: https://gerrit.libreoffice.org/970
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com

diff --git a/cui/source/dialogs/cuifmsearch.cxx 
b/cui/source/dialogs/cuifmsearch.cxx
index 225523b..2f2f323 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -226,7 +226,7 @@ FmSearchDialog::~FmSearchDialog()
 }
 
 //
-void FmSearchDialog::Init(const UniString strVisibleFields, const UniString 
sInitialText)
+void FmSearchDialog::Init(const OUString strVisibleFields, const OUString 
sInitialText)
 {
 //the initialization of all the Controls
 m_rbSearchForText.SetClickHdl(LINK(this, FmSearchDialog, 
OnClickedFieldRadios));
@@ -279,10 +279,10 @@ void FmSearchDialog::Init(const UniString 
strVisibleFields, const UniString sI
 m_cmbSearchText.SetText(sInitialText);
 // if the Edit-line has changed the text (e.g. because it contains
 // control characters, as can be the case with memo fields), I use
-// an empty UniString.
-UniString sRealSetText = m_cmbSearchText.GetText();
-if (!sRealSetText.Equals(sInitialText))
-m_cmbSearchText.SetText(UniString());
+// an empty OUString.
+OUString sRealSetText = m_cmbSearchText.GetText();
+if (!sRealSetText.equals(sInitialText))
+m_cmbSearchText.SetText(OUString());
 LINK(this, FmSearchDialog, OnSearchTextModified).Call(m_cmbSearchText);
 
 // initial
@@ -336,17 +336,17 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
 {
 if (m_pbClose.IsEnabled())
 {   // the button has the function 'search'
-UniString strThisRoundText = m_cmbSearchText.GetText();
+OUString strThisRoundText = m_cmbSearchText.GetText();
 // to history
 m_cmbSearchText.RemoveEntry(strThisRoundText);
 m_cmbSearchText.InsertEntry(strThisRoundText, 0);
-// the remove/insert makes sure that a) the UniString does not appear 
twice and
+// the remove/insert makes sure that a) the OUString does not appear 
twice and
 // that b) the last searched strings are at the beginning and limit 
the list length
 while (m_cmbSearchText.GetEntryCount()  MAX_HISTORY_ENTRIES)
 m_cmbSearchText.RemoveEntry(m_cmbSearchText.GetEntryCount()-1);
 
 // take out the 'overflow' hint
-m_ftHint.SetText(UniString());
+m_ftHint.SetText(OUString());
 m_ftHint.Invalidate();
 
 if (m_cbStartOver.IsChecked())
@@ -457,7 +457,7 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox)
 
 sal_Int32 nCurrentContext = m_lbForm.GetSelectEntryPos();
 if (nCurrentContext != LISTBOX_ENTRY_NOTFOUND)
-m_arrContextFields[nCurrentContext] = 
UniString(m_lbField.GetSelectEntry());
+m_arrContextFields[nCurrentContext] = 
OUString(m_lbField.GetSelectEntry());
 return 0;
 }
 
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index a220495..64cbd01 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -140,7 +140,7 @@ public:
 protected:
 virtual sal_Bool Close();
 
-void Init(const String strVisibleFields, const String strInitialText);
+void Init(const OUString strVisibleFields, const OUString 
strInitialText);
 // only to be used out of the constructors
 
 void OnFound(const ::com::sun::star::uno::Any aCursorPos, sal_Int16 
nFieldPos);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source svx/inc

[Libreoffice Gerrit user]

 cui/source/dialogs/cuifmsearch.cxx |2 +-
 cui/source/factory/dlgfact.cxx |2 +-
 cui/source/factory/dlgfact.hxx |2 +-
 cui/source/inc/cuifmsearch.hxx |2 +-
 svx/inc/svx/svxdlg.hxx |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 89519528563a0e740fe22acaf9ab90f83af99695
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Thu Nov 1 16:53:51 2012 -0200

fdo#38838 UniString replacement

Change-Id: I1323b2caf395c10b34e7467284402c0e3082f6a7
Reviewed-on: https://gerrit.libreoffice.org/965
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com

diff --git a/cui/source/dialogs/cuifmsearch.cxx 
b/cui/source/dialogs/cuifmsearch.cxx
index 0e6ace4..225523b 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -83,7 +83,7 @@ void FmSearchDialog::initCommon( const Reference XResultSet 
 _rxCursor )
 }
 
 //
-FmSearchDialog::FmSearchDialog(Window* pParent, const UniString sInitialText, 
const ::std::vector String  _rContexts, sal_Int16 nInitialContext,
+FmSearchDialog::FmSearchDialog(Window* pParent, const OUString sInitialText, 
const ::std::vector String  _rContexts, sal_Int16 nInitialContext,
 const Link lnkContextSupplier)
 :ModalDialog(pParent, CUI_RES(RID_SVXDLG_SEARCHFORM))
 ,m_flSearchFor  (this, CUI_RES(FL_SEARCHFOR))
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index ebd3d64..41124d6 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1503,7 +1503,7 @@ AbstractSvxHpLinkDlg * 
AbstractDialogFactory_Impl::CreateSvxHpLinkDlg (Window* p
 }
 
 AbstractFmSearchDialog*  
AbstractDialogFactory_Impl::CreateFmSearchDialog(Window* pParent, //add for 
FmSearchDialog
-const String 
strInitialText,
+const OUString 
strInitialText,
 const ::std::vector 
String  _rContexts,
 sal_Int16 
nInitialContext,
 const Link 
lnkContextSupplier)
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index d85f923..3c97f2b 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -709,7 +709,7 @@ public:
 SfxBindings* pBindings,
 sal_uInt32 nResId);
 virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* 
pParent, //add for FmSearchDialog
-const String 
strInitialText,
+const OUString 
strInitialText,
 const ::std::vector 
String  _rContexts,
 sal_Int16 
nInitialContext,
 const Link 
lnkContextSupplier);
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 36e5e0d..a220495 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -114,7 +114,7 @@ public:
 (of course needed : the string number i in strUsedFields of a context 
must correspond with the interface number i in the
 arrFields of the context)
 */
-FmSearchDialog(Window* pParent, const String strInitialText, const 
::std::vector String  _rContexts, sal_Int16 nInitialContext,
+FmSearchDialog(Window* pParent, const OUString strInitialText, const 
::std::vector String  _rContexts, sal_Int16 nInitialContext,
 const Link lnkContextSupplier);
 
 virtual ~FmSearchDialog();
diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx
index fdb75d3..05c952d 100644
--- a/svx/inc/svx/svxdlg.hxx
+++ b/svx/inc/svx/svxdlg.hxx
@@ -429,7 +429,7 @@ public:
 SfxBindings* pBindings,
 sal_uInt32 nResId)=0;
 virtual AbstractFmSearchDialog* CreateFmSearchDialog(Window* pParent, 
//add for FmSearchDialog
-const String 
strInitialText,
+const OUString 
strInitialText,
 const ::std::vector 
String  _rContexts,
 sal_Int16 
nInitialContext,
 const Link 
lnkContextSupplier)=0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/dialogs/scriptdlg.cxx |5 -
 1 file changed, 5 deletions(-)

New commits:
commit 2a088faa707657cbeb21c2c7ed2ac201d1318718
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Oct 31 14:34:45 2012 +

remove stray unused temporary debugging objects

Change-Id: Ibb9bbf018e4e9c1487ccdf6505a2a15d7c24eb24

diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index cd85721..b071764 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -100,8 +100,6 @@ void SFTreeListBox::delUserData( SvTreeListEntry* pEntry )
 {
 if ( pEntry )
 {
-
-String text = GetEntryText( pEntry );
 SFEntry* pUserData = (SFEntry*)pEntry-GetUserData();
 if ( pUserData )
 {
@@ -139,7 +137,6 @@ void SFTreeListBox::deleteAllTree()
 {
 while ( pEntry )
 {
-String text = GetEntryText( pEntry );
 SvTreeListEntry* pNextEntry = NextSibling( pEntry ) ;
 deleteTree( pEntry );
 GetModel()-Remove( pEntry );
@@ -1249,10 +1246,8 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
 {
 String aTmp( aStoredEntry.GetToken( 0, ';', nIndex ) );
 SvTreeListEntry* pTmpEntry = aScriptsBox.FirstChild( pEntry );
-::rtl::OUString debugStr(aTmp);
 while ( pTmpEntry )
 {
-debugStr = ::rtl::OUString(aScriptsBox.GetEntryText( pTmpEntry ));
 if ( aScriptsBox.GetEntryText( pTmpEntry ) == aTmp )
 {
 pEntry = pTmpEntry;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source sfx2/inc sfx2/source sw/source unusedcode.easy

[Libreoffice Gerrit user]

 cui/source/dialogs/insdlg.cxx |7 ---
 cui/source/inc/insdlg.hxx |1 
 sfx2/inc/sfx2/thumbnailview.hxx   |9 
 sfx2/source/control/thumbnailview.cxx |   69 --
 sw/source/ui/inc/swvset.hxx   |7 +--
 sw/source/ui/misc/insrule.cxx |6 --
 unusedcode.easy   |   32 ---
 7 files changed, 28 insertions(+), 103 deletions(-)

New commits:
commit 6affa4be69aa31e27af9d50e9ab6bd740319c379
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Oct 27 15:13:34 2012 +0100

callcatcher: update list, stop hiding uncalled tests :-)

Change-Id: I9bd81a9c5e85db4512a3e4768c9b87696c91b7bc

diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 9b0529e..de7e610 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -91,13 +91,6 @@ uno::Reference io::XInputStream  
InsertObjectDialog_Impl::GetIconIfIconified(
 return uno::Reference io::XInputStream ();
 }
 
-InsertObjectDialog_Impl::InsertObjectDialog_Impl( Window * pParent, const 
ResId  rResId, const com::sun::star::uno::Reference  
com::sun::star::embed::XStorage  xStorage )
- : ModalDialog( pParent, rResId )
- , m_xStorage( xStorage )
- , aCnt( m_xStorage )
-{
-}
-
 InsertObjectDialog_Impl::InsertObjectDialog_Impl(Window * pParent, const 
OString rID,
 const OUString rUIXMLDescription,
 const com::sun::star::uno::Reference  com::sun::star::embed::XStorage  
xStorage)
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 1f9daae..37fe1e2 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -44,7 +44,6 @@ protected:
 const com::sun::star::uno::Reference  com::sun::star::embed::XStorage  
m_xStorage;
 comphelper::EmbeddedObjectContainer aCnt;
 
-InsertObjectDialog_Impl( Window * pParent, const ResId  rResId, const 
com::sun::star::uno::Reference  com::sun::star::embed::XStorage  xStorage );
 InsertObjectDialog_Impl(Window * pParent, const OString rID,
 const OUString rUIXMLDescription,
 const com::sun::star::uno::Reference  com::sun::star::embed::XStorage 
 xStorage);
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 12d2812..084b3d1 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -179,16 +179,10 @@ public:
 
 virtual ~ThumbnailView ();
 
-void InsertItem( sal_uInt16 nItemId,
- const BitmapEx rImage, const OUString rStr,
- size_t nPos = THUMBNAILVIEW_APPEND );
-
 void RemoveItem( sal_uInt16 nItemId );
 
 void Clear();
 
-size_t GetItemCount() const;
-
 size_t GetItemPos( sal_uInt16 nItemId ) const;
 
 sal_uInt16 GetItemId( size_t nPos ) const;
@@ -300,13 +294,10 @@ protected:
 SFX2_DLLPRIVATE void ImplInitScrollBar();
 SFX2_DLLPRIVATE void ImplDeleteItems();
 SFX2_DLLPRIVATE void ImplDraw();
-using Window::ImplScroll;
-SFX2_DLLPRIVATE bool ImplScroll( const Point rPos );
 SFX2_DLLPRIVATE size_t   ImplGetItem( const Point rPoint, bool bMove 
= false ) const;
 SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetItem( size_t nPos );
 SFX2_DLLPRIVATE sal_uInt16  ImplGetVisibleItemCount() const;
 SFX2_DLLPRIVATE ThumbnailViewItem*ImplGetVisibleItem( sal_uInt16 
nVisiblePos );
-SFX2_DLLPRIVATE void ImplInsertItem( ThumbnailViewItem *const 
pItem, const size_t nPos );
 SFX2_DLLPRIVATE voidImplFireAccessibleEvent( short nEventId, 
const ::com::sun::star::uno::Any rOldValue, const ::com::sun::star::uno::Any 
rNewValue );
 SFX2_DLLPRIVATE bool ImplHasAccessibleListeners();
 DECL_DLLPRIVATE_LINK( ImplScrollHdl, ScrollBar* );
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 6741b59..fd2d215 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -405,40 +405,6 @@ void ThumbnailView::CalculateItemPositions ()
 delete pDelScrBar;
 }
 
-bool ThumbnailView::ImplScroll( const Point rPos )
-{
-if ( !mbScroll || !maItemListRect.IsInside(rPos) )
-return false;
-
-const long nScrollOffset = (mnItemHeight = 16) ? SCROLL_OFFSET/2 : 
SCROLL_OFFSET;
-bool bScroll = false;
-
-if ( rPos.Y() = maItemListRect.Top()+nScrollOffset )
-{
-if ( mnFirstLine  0 )
-{
---mnFirstLine;
-bScroll = true;
-}
-}
-else if ( rPos.Y() = maItemListRect.Bottom()-nScrollOffset )
-{
-if ( mnFirstLine  static_castsal_uInt16(mnLines-mnVisLines) )
-{
-++mnFirstLine;
-bScroll = true;
-}
-}
-
-if ( !bScroll )
-return false;
-
-if ( IsReallyVisible()  IsUpdateMode() )
-Invalidate();
-
-return true;
-}
-
 size_t ThumbnailView::ImplGetItem( const 

[Libreoffice-commits] .: cui/source svtools/inc svtools/source vcl/inc vcl/source

[Libreoffice Gerrit user]

 cui/source/dialogs/about.cxx |1 +
 cui/source/dialogs/insdlg.cxx|1 -
 svtools/inc/svtools/svmedit2.hxx |1 -
 svtools/source/edit/svmedit2.cxx |5 -
 vcl/inc/vcl/vclmedit.hxx |1 +
 vcl/source/edit/vclmedit.cxx |5 +
 vcl/source/window/msgbox.cxx |1 +
 7 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 9dbb62555f0813cc55e48be28047f22e2b3ea4ef
Author: Ivan Timofeev timofeev@gmail.com
Date:   Mon Oct 22 17:25:12 2012 +0400

disable cursor in about dialog and message boxes

Change-Id: I060872e0a468f2ce26a2ab519c5bfe271574170b

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 23b9bd5..9dc8384 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -166,6 +166,7 @@ void AboutDialog::StyleControls()
 // Version Text
 aLargeFont.SetSize( Size( 0, aLabelFont.GetSize().Height() * 1.2 ) );
 aVersionText.SetControlFont( aLargeFont );
+aVersionText.EnableCursor( sal_False );
 
 // Copyright Text
 aCopyrightText.SetTextSelectable( sal_False );
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 069d26c..9c42a48 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -46,7 +46,6 @@
 #include vcl/lstbox.hxx
 #include vcl/msgbox.hxx
 #include vcl/svapp.hxx
-#include vcl/vclmedit.hxx
 #include sot/clsids.hxx
 #include sfx2/frmdescr.hxx
 #include sfx2/viewsh.hxx
diff --git a/svtools/inc/svtools/svmedit2.hxx b/svtools/inc/svtools/svmedit2.hxx
index 74645a2..68b7541 100644
--- a/svtools/inc/svtools/svmedit2.hxx
+++ b/svtools/inc/svtools/svmedit2.hxx
@@ -34,7 +34,6 @@ public:
 // methods of TextView
 voidInsertText( const String rNew, sal_Bool bSelect = 
sal_False );
 voidSetAutoScroll( sal_Bool bAutoScroll );
-voidEnableCursor( sal_Bool bEnable );
 
 // methods of TextEngine
 voidSetAttrib( const TextAttrib rAttr, sal_uLong nPara, 
sal_uInt16 nStart, sal_uInt16 nEnd );
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
index 8d530b2..911c47f 100644
--- a/svtools/source/edit/svmedit2.cxx
+++ b/svtools/source/edit/svmedit2.cxx
@@ -49,11 +49,6 @@ void ExtMultiLineEdit::SetAutoScroll( sal_Bool bAutoScroll )
 GetTextView()-SetAutoScroll( bAutoScroll );
 }
 
-void ExtMultiLineEdit::EnableCursor( sal_Bool bEnable )
-{
-GetTextView()-EnableCursor( bEnable );
-}
-
 void ExtMultiLineEdit::SetAttrib( const TextAttrib rAttr, sal_uLong nPara, 
sal_uInt16 nStart, sal_uInt16 nEnd )
 {
 GetTextEngine()-SetAttrib( rAttr, nPara, nStart, nEnd );
diff --git a/vcl/inc/vcl/vclmedit.hxx b/vcl/inc/vcl/vclmedit.hxx
index 7ecb944..0264b4a 100644
--- a/vcl/inc/vcl/vclmedit.hxx
+++ b/vcl/inc/vcl/vclmedit.hxx
@@ -137,6 +137,7 @@ public:
 voidDisableSelectionOnFocus();
 
 voidSetTextSelectable( sal_Bool bTextSelectable );
+voidEnableCursor( sal_Bool bEnable );
 };
 
 inline sal_uLong VclMultiLineEdit::IsUpdateDataEnabled() const
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index fce3a0d..bee4278 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -1569,4 +1569,9 @@ void VclMultiLineEdit::SetTextSelectable( sal_Bool 
bTextSelectable )
 pImpVclMEdit-GetTextWindow()-SetTextSelectable( bTextSelectable );
 }
 
+void VclMultiLineEdit::EnableCursor( sal_Bool bEnable )
+{
+GetTextView()-EnableCursor( bEnable );
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 41c1505..353eab8 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -403,6 +403,7 @@ void MessBox::ImplPosControls()
 mpVCLMultiLineEdit-SetPosSizePixel( aTextPos, aMEditSize );
 mpVCLMultiLineEdit-Show();
 mpVCLMultiLineEdit-SetPaintTransparent(sal_True);
+mpVCLMultiLineEdit-EnableCursor(sal_False);
 SetPageSizePixel( aPageSize );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/dialogs/colorpicker.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8545bf9afc3d4adfd3e7d33c5063a3ee259327a6
Author: Ivan Timofeev timofeev@gmail.com
Date:   Mon Oct 22 20:23:18 2012 +0400

fdo#55800: fix hex color conversion

Change-Id: I705ff4c83f635fcfea383a00eec724110d2e4b45

diff --git a/cui/source/dialogs/colorpicker.cxx 
b/cui/source/dialogs/colorpicker.cxx
index 5d19c61..e66403c 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1383,8 +1383,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] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optlingu.cxx |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit 2d4d38bcf2791e9e0805f5a61e2f7d48f4c7a2a6
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Oct 12 13:12:22 2012 +0100

lcl_Bool2Any is unused

Change-Id: Ida5baa01cb3ce7fd611360e122f9f8ffebd9e7d8

diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index dab862d..07c5ddc 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1195,19 +1195,6 @@ SfxTabPage* SvxLinguTabPage::Create( Window* pParent,
 
 //
 
-static Any lcl_Bool2Any(sal_Bool bVal)
-{
-Any aRet(bVal, ::getBooleanCppuType());
-return aRet;
-}
-
-
-static sal_Bool lcl_Bool2Any(Any rVal)
-{
-return *(sal_Bool*)rVal.getValue();
-}
-
-
 sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet rCoreSet )
 {
 sal_Bool bModified = sal_True; // 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optlingu.cxx |   13 -
 1 file changed, 13 deletions(-)

New commits:
commit 57cd67224ab349f7738f4429f3adc569b7bacb11
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Oct 12 13:14:47 2012 +0100

lcl_GetServiceName unused

Change-Id: Iea5b8de7c937f27beb0e95b40412dc56391c02f7

diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 07c5ddc..9beea46 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -2107,19 +2107,6 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, 
SvTreeListBox *, pBox )
 return 0;
 }
 
-static OUString lcl_GetServiceName(sal_uInt8 nType)
-{
-switch(nType)
-{
-case  TYPE_SPELL: return OUString(cSpell);
-case  TYPE_GRAMMAR  : return OUString(cGrammar);
-case  TYPE_HYPH : return OUString(cHyph);
-case  TYPE_THES : return OUString(cThes);
-}
-return OUString();
-}
-
-
 IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
 {
 LanguageType  eCurLanguage = aLanguageLB.GetSelectLanguage();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optasian.cxx |   14 ++
 cui/source/options/optgdlg.cxx  |   26 +--
 cui/source/options/optinet2.cxx |6 --
 cui/source/options/optlingu.cxx |   59 --
 cui/source/options/optsave.cxx  |   24 --
 cui/source/options/optupdt.cxx  |   42 --
 cui/source/options/treeopt.cxx  |   90 ++--
 7 files changed, 121 insertions(+), 140 deletions(-)

New commits:
commit cf5593ae02ec8fabf47662f84bee7913a74d1e7e
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Oct 5 10:07:15 2012 +0200

cui: kill C2U and UNISTRING macros

Change-Id: I69d883e623f7fffd37c05b85a6655009da9c23a8

diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 9c3df99..229af97 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -44,8 +44,6 @@ using namespace com::sun::star::frame;
 using namespace com::sun::star::beans;
 using rtl::OUString;
 
-#define C2U(cChar) rtl::OUString::createFromAscii(cChar)
-
 const sal_Char cIsKernAsianPunctuation[] = IsKernAsianPunctuation;
 const sal_Char cCharacterCompressionType[] = CharacterCompressionType;
 
@@ -171,7 +169,7 @@ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet )
 if(aCharKerningRB.IsChecked() != aCharKerningRB.GetSavedValue())
 {
 pImpl-aConfig.SetKerningWesternTextOnly(aCharKerningRB.IsChecked());
-OUString sPunct(C2U(cIsKernAsianPunctuation));
+OUString sPunct(cIsKernAsianPunctuation);
 if(pImpl-xPrSetInfo.is()  
pImpl-xPrSetInfo-hasPropertyByName(sPunct))
 {
 Any aVal;
@@ -187,7 +185,7 @@ sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet )
 sal_Int16 nSet = aNoCompressionRB.IsChecked() ? 0 :
 aPunctCompressionRB.IsChecked() ? 1 : 2;
 pImpl-aConfig.SetCharDistanceCompression(nSet);
-OUString sCompress(C2U(cCharacterCompressionType));
+OUString sCompress(cCharacterCompressionType);
 if(pImpl-xPrSetInfo.is()  
pImpl-xPrSetInfo-hasPropertyByName(sCompress))
 {
 Any aVal;
@@ -233,11 +231,11 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet )
 if(xFact.is())
 {
 pImpl-xPrSet = ReferenceXPropertySet(
-xFact-createInstance(C2U(com.sun.star.document.Settings)), 
UNO_QUERY);
+xFact-createInstance(com.sun.star.document.Settings), 
UNO_QUERY);
 }
 if( pImpl-xPrSet.is() )
 pImpl-xPrSetInfo = pImpl-xPrSet-getPropertySetInfo();
-OUString sForbidden(C2U(ForbiddenCharacters));
+OUString sForbidden(ForbiddenCharacters);
 sal_Bool bKernWesternText = pImpl-aConfig.IsKerningWesternTextOnly();
 sal_Int16 nCompress = pImpl-aConfig.GetCharDistanceCompression();
 if(pImpl-xPrSetInfo.is())
@@ -247,13 +245,13 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet )
 Any aForbidden = pImpl-xPrSet-getPropertyValue(sForbidden);
 aForbidden = pImpl-xForbidden;
 }
-OUString sCompress(C2U(cCharacterCompressionType));
+OUString sCompress(cCharacterCompressionType);
 if(pImpl-xPrSetInfo-hasPropertyByName(sCompress))
 {
 Any aVal = pImpl-xPrSet-getPropertyValue(sCompress);
 aVal = nCompress;
 }
-OUString sPunct(C2U(cIsKernAsianPunctuation));
+OUString sPunct(cIsKernAsianPunctuation);
 if(pImpl-xPrSetInfo-hasPropertyByName(sPunct))
 {
 Any aVal = pImpl-xPrSet-getPropertyValue(sPunct);
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 84bcad0..5484fd8 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -98,8 +98,6 @@ using namespace ::utl;
 using ::rtl::OString;
 using ::rtl::OUString;
 
-#define C2U(cChar) OUString::createFromAscii(cChar)
-
 // class OfaMiscTabPage --
 
 int OfaMiscTabPage::DeactivatePage( SfxItemSet* pSet_ )
@@ -1496,7 +1494,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet 
rSet )
 sNewLang = aLocale.Language;
 if ( !aLocale.Country.isEmpty() )
 {
-sNewLang += C2U(-);
+sNewLang += -;
 sNewLang += aLocale.Country;
 }
 }
@@ -1549,7 +1547,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet 
rSet )
 Any aValue;
 Locale aLocale = MsLangId::convertLanguageToLocale( eSelectLang, 
false );
 aValue = aLocale;
-OUString aPropName( C2U(DefaultLocale) );
+OUString aPropName( DefaultLocale );
 pLangConfig-aLinguConfig.SetProperty( aPropName, aValue );
 if (xLinguProp.is())
 xLinguProp-setPropertyValue( aPropName, aValue );
@@ -1569,7 +1567,7 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet 
rSet )
 Any aValue;
 Locale 

[Libreoffice-commits] .: cui/source svx/inc svx/source

[Libreoffice Gerrit user]

 cui/source/inc/transfrm.hxx   |   10 ++
 cui/source/tabpages/transfrm.cxx  |   61 ++
 cui/source/tabpages/transfrm.hrc  |2 -
 cui/source/tabpages/transfrm.src  |   21 +
 svx/inc/svx/dialcontrol.hxx   |6 +++
 svx/source/dialog/dialcontrol.cxx |   12 +++
 6 files changed, 42 insertions(+), 70 deletions(-)

New commits:
commit 0cd97e8c33c49a6c44d26ba309493dbfec00eb8d
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Wed Sep 26 21:20:27 2012 +0200

Change the image rotation widget to better looking DialControl

Change-Id: Ie11827a924a5b22d86bad24aa7f14a66b870e90c

diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 0081d58..35196b1 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -29,6 +29,7 @@
 #define _SVX_TRANSFRM_HXX
 
 #include svx/dlgctrl.hxx
+#include svx/dialcontrol.hxx
 
 #include vcl/fixed.hxx
 
@@ -205,9 +206,9 @@ private:
 
 FixedLine   aFlAngle;
 FixedText   aFtAngle;
-MetricField aMtrAngle;
+NumericFieldmaNfAngle;
 FixedText   aFtAnglePresets;
-SvxRectCtl  aCtlAngle;
+svx::DialControlaCtlAngle;
 
 const SfxItemSet   rOutAttrs;
 const SdrView*  pView;
@@ -218,10 +219,7 @@ private:
 
 SfxMapUnit  ePoolUnit;
 FieldUnit   eDlgUnit;
-//
-#if _SOLAR__PRIVATE
-DECL_LINK( ModifiedHdl, void * );
-#endif
+
 public:
  SvxAngleTabPage( Window* pParent, const SfxItemSet rInAttrs  );
 
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 57daf10..54d32d8 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -228,10 +228,9 @@ SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const 
SfxItemSet rInAttrs  )
 
 aFlAngle( this, CUI_RES( FL_ANGLE ) ),
 aFtAngle( this, CUI_RES( FT_ANGLE ) ),
-aMtrAngle   ( this, CUI_RES( MTR_FLD_ANGLE ) ),
+maNfAngle   ( this, CUI_RES( NF_ANGLE ) ),
 aFtAnglePresets ( this, CUI_RES(FT_ANGLEPRESETS) ),
-aCtlAngle   ( this, CUI_RES( CTL_ANGLE ),
-RP_RB, 200, 80, CS_ANGLE ),
+aCtlAngle   ( this, CUI_RES( CTL_ANGLE ) ),
 rOutAttrs   ( rInAttrs )
 {
 FreeResource();
@@ -241,12 +240,11 @@ SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const 
SfxItemSet rInAttrs  )
 DBG_ASSERT( pPool, no pool (!) );
 ePoolUnit = pPool-GetMetric(SID_ATTR_TRANSFORM_POS_X);
 
-aMtrAngle.SetModifyHdl(LINK( this, SvxAngleTabPage, ModifiedHdl));
-
 aCtlRect.SetAccessibleRelationLabeledBy(aFtPosPresets);
 aCtlRect.SetAccessibleRelationMemberOf(aFlPosition);
 aCtlAngle.SetAccessibleRelationLabeledBy(aFtAnglePresets);
 aCtlAngle.SetAccessibleRelationMemberOf(aFlAngle);
+aCtlAngle.SetLinkedField( maNfAngle );
 }
 
 // ---
@@ -303,29 +301,27 @@ void SvxAngleTabPage::Construct()
 aCtlRect.Disable();
 aFlAngle.Disable();
 aFtAngle.Disable();
-aMtrAngle.Disable();
+maNfAngle.Disable();
 aFtAnglePresets.Disable();
 aCtlAngle.Disable();
 }
 }
 
-// ---
-
 sal_Bool SvxAngleTabPage::FillItemSet(SfxItemSet rSet)
 {
 sal_Bool bModified = sal_False;
 
-if(aMtrAngle.IsValueModified() || aMtrPosX.IsValueModified() || 
aMtrPosY.IsValueModified())
+if(aCtlAngle.IsValueModified() || aMtrPosX.IsValueModified() || 
aMtrPosY.IsValueModified())
 {
 const double fUIScale(double(pView-GetModel()-GetUIScale()));
 const double fTmpX((GetCoreValue(aMtrPosX, ePoolUnit) + 
maAnchor.getX()) * fUIScale);
 const double fTmpY((GetCoreValue(aMtrPosY, ePoolUnit) + 
maAnchor.getY()) * fUIScale);
 
-rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE), 
static_castsal_Int32(aMtrAngle.GetValue(;
+rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ANGLE), 
aCtlAngle.GetRotation()));
 rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_X), 
basegfx::fround(fTmpX)));
 rSet.Put(SfxInt32Item(GetWhich(SID_ATTR_TRANSFORM_ROT_Y), 
basegfx::fround(fTmpY)));
 
-bModified |= sal_True;
+bModified = sal_True;
 }
 
 return bModified;
@@ -362,15 +358,13 @@ void SvxAngleTabPage::Reset(const SfxItemSet rAttrs)
 pItem = GetItem( rAttrs, SID_ATTR_TRANSFORM_ANGLE );
 if(pItem)
 {
-aMtrAngle.SetValue(((const SfxInt32Item*)pItem)-GetValue());
+aCtlAngle.SetRotation(((const SfxInt32Item*)pItem)-GetValue());
 }
 else
 {
-aMtrAngle.SetText( String() );
+aCtlAngle.SetRotation(0);
 }
-
-aMtrAngle.SaveValue();
-ModifiedHdl(this);
+

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optgenrl.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 3610d36782ca30aa6478921bcf331dcd7a554efb
Author: Chris Copits chrisc...@live.com
Date:   Tue Sep 18 21:11:52 2012 -0400

fdo#43497 Editing the first or last name clears initials.

Since middle names are not supported, editing the first name or last name 
will clear the initials if more than two initials are used. Specifically, the 
change was made to ModifyHdl_Impl() / IMPL_LINK() in optgenrl.cxx.

Change-Id: I067ad4701cee9077c500f4e8b3870db24e158cc3
Reviewed-on: https://gerrit.libreoffice.org/673
Reviewed-by: Noel Power noel.po...@suse.com
Tested-by: Noel Power noel.po...@suse.com

diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index c82c45c..1337f4f 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -458,6 +458,13 @@ IMPL_LINK( SvxGeneralTabPage, ModifyHdl_Impl, Edit *, 
pEdit )
 for (unsigned i = 0; i != nInits; ++i)
 if (vFields[rNameRow.nFirstField + i]-aEdit == pEdit)
 nField = i;
+   // Since middle names are not supported, clear shortname if it
+   // contains a middle initial
+   if (rtl::OUString(rShortName.aEdit.GetText()).getLength()  2)
+   {
+   rtl::OUString sEmptyString;
+   rShortName.aEdit.SetText(sEmptyString);
+   }
 // updating the initial
 if (nField  nInits  rShortName.aEdit.IsEnabled())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source editeng/inc editeng/source

[Libreoffice Gerrit user]

 cui/source/inc/autocdlg.hxx  |   35 ---
 cui/source/tabpages/autocdlg.cxx |  188 +++
 editeng/inc/editeng/svxacorr.hxx |7 +
 editeng/source/misc/svxacorr.cxx |  101 
 4 files changed, 205 insertions(+), 126 deletions(-)

New commits:
commit 0513e10635c85fc1aa214948de4992d4b76d555c
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Sun Sep 23 21:49:45 2012 +0200

fdo#49350 Speedup OK action of auto-correct dialog

Instead of synchronizing the main list and the list of entries in the
dialog, just remember what was added and removed and only add / remove
those entries in the main SvxAutoCorrect list.
Additional add MakeCombinedChanges which adds and remove entries in
one call and only writes changes to the acor file once.

Change-Id: Idcc4c64d25e050c3f6eb9960a59c4a55d06b5ca1

diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 98c8cce..5dd0bf1 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -223,9 +223,18 @@ struct DoubleString
 String  sLong;
 void*   pUserData; /// CheckBox - form. Text Bool - selection text
 };
+
 typedef std::vectorDoubleString DoubleStringArray;
 typedef std::mapLanguageType, DoubleStringArray DoubleStringTable;
 
+struct StringChangeList
+{
+DoubleStringArray aNewEntries;
+DoubleStringArray aDeletedEntries;
+};
+
+typedef std::mapLanguageType, StringChangeList StringChangeTable;
+
 class OfaAutocorrReplacePage : public SfxTabPage
 {
 using TabPage::ActivatePage;
@@ -233,7 +242,8 @@ class OfaAutocorrReplacePage : public SfxTabPage
 
 private:
 
-
+StringChangeTable aChangesTable;
+
 CheckBoxaTextOnlyCB;
 FixedText   aShortFT;
 AutoCorrEditaShortED;
@@ -252,32 +262,33 @@ private:
 CharClass*  pCharClass;
 LanguageTypeeLang;
 
-sal_BoolbHasSelectionText;
-sal_BoolbFirstSelect:1;
-sal_BoolbReplaceEditChanged:1;
-sal_BoolbSWriter:1;
+sal_Bool bHasSelectionText;
+sal_Bool bFirstSelect:1;
+sal_Bool bReplaceEditChanged:1;
+sal_Bool bSWriter:1;
 
 DECL_LINK(SelectHdl, SvTabListBox*);
 DECL_LINK(NewDelHdl, PushButton*);
 DECL_LINK(ModifyHdl, Edit*);
 
-voidRefillReplaceBox(sal_Bool bFromReset,
-LanguageType eOldLanguage,
-LanguageType eNewLanguage);
+void RefillReplaceBox(  sal_Bool bFromReset,
+LanguageType eOldLanguage,
+LanguageType eNewLanguage);
 
 public:
 OfaAutocorrReplacePage( Window* pParent, const 
SfxItemSet rSet );
 ~OfaAutocorrReplacePage();
 
-static SfxTabPage*  Create( Window* pParent,
-const SfxItemSet rAttrSet);
+static SfxTabPage*  Create( Window* pParent, const SfxItemSet rAttrSet);
 
-virtual sal_BoolFillItemSet( SfxItemSet rSet );
+virtual sal_BoolFillItemSet( SfxItemSet rSet );
 virtual voidReset( const SfxItemSet rSet );
 virtual voidActivatePage( const SfxItemSet );
 virtual int DeactivatePage( SfxItemSet* pSet = 0 );
 
-voidSetLanguage(LanguageType eSet);
+voidSetLanguage(LanguageType eSet);
+voidDeleteEntry(String sShort, String sLong);
+voidNewEntry(String sShort, String sLong);
 };
 
 // class OfaAutocorrExceptPage -
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index a104a15..858a113 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -918,6 +918,8 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage( Window* 
pParent,
 OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
 {
 aDoubleStringTable.clear();
+aChangesTable.clear();
+
 delete pCompareClass;
 delete pCharClass;
 }
@@ -942,125 +944,30 @@ int OfaAutocorrReplacePage::DeactivatePage( SfxItemSet*  
)
 sal_Bool OfaAutocorrReplacePage::FillItemSet( SfxItemSet )
 {
 SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
-for (DoubleStringTable::reverse_iterator it = aDoubleStringTable.rbegin(); 
it != aDoubleStringTable.rend(); ++it)
-{
-LanguageType eCurLang = it-first;
-DoubleStringArray rDoubleStringArray = it-second;
-if( eCurLang != eLang ) // the current language is treated later
-{
-SvxAutocorrWordList* pWordList = 
pAutoCorrect-LoadAutocorrWordList(eCurLang);
-sal_uInt32 nDoubleStringArrayCount = rDoubleStringArray.size();
-sal_uInt32 nPos = nDoubleStringArrayCount;
-sal_uInt32 nLastPos = nPos;
 
-// 1st 

[Libreoffice-commits] .: cui/source dbaccess/source desktop/source forms/source framework/source offapi/com offapi/UnoApi_offapi.mk sd/source sfx2/source svtools/source sw/source

[Libreoffice Gerrit user]

 cui/source/customize/acccfg.cxx|5 +
 cui/source/customize/cfg.cxx   |5 +
 cui/source/customize/cfgutil.cxx   |5 +
 cui/source/customize/selector.cxx  |5 +
 dbaccess/source/ui/control/opendoccontrols.cxx |4 -
 desktop/source/app/app.cxx |5 +
 desktop/source/migration/migration.cxx |6 +-
 forms/source/helper/commanddescriptionprovider.cxx |4 -
 framework/source/lomenubar/FrameHelper.cxx |4 -
 offapi/UnoApi_offapi.mk|2 
 offapi/com/sun/star/frame/UICommandDescription.idl |   56 +
 offapi/com/sun/star/ui/UICommandDescription.idl|   56 -
 sd/source/ui/dlg/dlgass.cxx|5 +
 sd/source/ui/view/ViewShellBase.cxx|5 +
 sfx2/source/dialog/recfloat.cxx|4 -
 sfx2/source/dialog/templdlg.cxx|5 +
 sfx2/source/view/viewsh.cxx|5 +
 svtools/source/uno/contextmenuhelper.cxx   |5 +
 sw/source/ui/lingu/olmenu.cxx  |7 +-
 19 files changed, 104 insertions(+), 89 deletions(-)

New commits:
commit 6a1c29d7efd505346d4b43ee2b7080e8d769301e
Author: Michael Stahl mst...@redhat.com
Date:   Wed Sep 5 22:46:40 2012 +0200

offapi: move css.ui.UICommandDescription to css.frame.UICommandDescription:

The service implementation used com.sun.star.frame.UICommandDescription
since forever, so the IDL file was essentially wrong documentation.
But since 7a464263cc5c2ca2b7128734ff4860e02d662818 converted the service
to new-style, it cannot be instantated any more and e.g. clicking on
Tools-Customize crashes.
(Adapting the implementation instead would be an incompatible change.)

Change-Id: I564bddaf3836827f5b72360a2bde19d6158b7ba5

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 957eb38..8ed9d6c 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -56,7 +56,7 @@
 #include com/sun/star/form/XReset.hpp
 #include com/sun/star/ui/ModuleUIConfigurationManagerSupplier.hpp
 #include com/sun/star/frame/ModuleManager.hpp
-#include com/sun/star/ui/UICommandDescription.hpp
+#include com/sun/star/frame/UICommandDescription.hpp
 #include com/sun/star/ui/XUIConfigurationManagerSupplier.hpp
 #include com/sun/star/ui/XUIConfigurationManager.hpp
 #include com/sun/star/awt/KeyModifier.hpp
@@ -852,7 +852,8 @@ void SfxAcceleratorConfigPage::InitAccCfg()
 // no - initialize this instance
 m_xSMGR = ::comphelper::getProcessServiceFactory();
 
-m_xUICmdDescription = 
css::ui::UICommandDescription::create(comphelper::ComponentContext(m_xSMGR).getUNOContext());
+m_xUICmdDescription = css::frame::UICommandDescription::create(
+comphelper::ComponentContext(m_xSMGR).getUNOContext());
 
 // get the current active frame, which should be our parent
 // for this session
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 0a0e706..626a25d 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -75,7 +75,7 @@
 #include com/sun/star/frame/ModuleManager.hpp
 #include com/sun/star/frame/XController.hpp
 #include com/sun/star/frame/XDesktop.hpp
-#include com/sun/star/ui/UICommandDescription.hpp
+#include com/sun/star/frame/UICommandDescription.hpp
 #include com/sun/star/ui/XUIConfiguration.hpp
 #include com/sun/star/ui/XUIConfigurationListener.hpp
 #include com/sun/star/ui/XUIConfigurationManagerSupplier.hpp
@@ -914,7 +914,8 @@ SaveInData::SaveInData(
 ::comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
 
 uno::Reference container::XNameAccess  xNameAccess(
-
css::ui::UICommandDescription::create(comphelper::ComponentContext(m_xServiceManager).getUNOContext())
 );
+css::frame::UICommandDescription::create(
+comphelper::ComponentContext(m_xServiceManager).getUNOContext()) );
 
 xNameAccess-getByName( aModuleId ) = m_xCommandToLabelMap;
 
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 44cd36b..0f08675 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -45,7 +45,7 @@
 #include com/sun/star/document/XDocumentInfoSupplier.hpp
 #include com/sun/star/document/XScriptInvocationContext.hpp
 #include com/sun/star/style/XStyleFamiliesSupplier.hpp
-#include com/sun/star/ui/UICommandDescription.hpp
+#include com/sun/star/frame/UICommandDescription.hpp
 
 #include acccfg.hrc
 #include helpid.hrc
@@ -586,7 +586,8 @@ void SfxConfigGroupListBox_Impl::Init(const 
css::uno::Reference css::lang::XMul
 
 m_xGlobalCategoryInfo = css::uno::Reference 
css::container::XNameAccess 
(m_xSMGR-createInstance(SERVICE_UICATEGORYDESCRIPTION), 
css::uno::UNO_QUERY_THROW);
  

[Libreoffice-commits] .: cui/source officecfg/registry svl/inc svl/source unotools/inc unotools/source

[Libreoffice Gerrit user]

 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 cda156257003df673fa853a0a5ffcd1cb4848d43
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

Change-Id: I9e20fcb168578b02d0f0248a0e209942e0f27113

diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 4f83368..5f7015b 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1206,6 +1206,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();
+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  )),
@@ -1219,6 +1235,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  )),
@@ -1341,6 +1360,8 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* 
pParent, const SfxItemSet rSe
 delete pLanguageTable;
 
 aLocaleSettingLB.SetSelectHdl( LINK( this, OfaLanguagesTabPage, 
LocaleSettingHdl ) );
+aDatePatternsED.SetModifyHdl( LINK( this, OfaLanguagesTabPage, 
DatePatternsHdl ) );
+
 Link aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) );
 aAsianSupportCB.SetClickHdl( aLink );
 aCTLSupportCB.SetClickHdl( aLink );
@@ -1537,6 +1558,11 @@ sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet 
rSet )
 if ( sOldCurr != sNewCurr )
 pLangConfig-aSysLocaleOptions.SetCurrencyConfigString( sNewCurr );
 
+// Configured date acceptance patterns, for example Y-M-D;M-D or empty for
+// locale default.
+if 

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optgenrl.hrc |3 ---
 cui/source/options/optgenrl.src |6 --
 2 files changed, 9 deletions(-)

New commits:
commit 11fb0c14477e8510d9b359f1188f1ce119dbe8c2
Author: Andras Timar ati...@suse.com
Date:   Wed Aug 29 23:06:31 2012 +0200

remove unused resources

Change-Id: I07c3a456b36a4f032f5e158632eccd4370ce0085

diff --git a/cui/source/options/optgenrl.hrc b/cui/source/options/optgenrl.hrc
index 8b52a08..c35acc1 100644
--- a/cui/source/options/optgenrl.hrc
+++ b/cui/source/options/optgenrl.hrc
@@ -54,9 +54,6 @@
 #define FT_NAME_EASTERN 41
 #define FT_CITY_US  42
 
-#define STR_US_STATE10
-#define STR_QUERY_REG   11
-
 #endif // #ifndef SVX_OPTGENRL_HRC
 
 // *** EOF
diff --git a/cui/source/options/optgenrl.src b/cui/source/options/optgenrl.src
index 3eaabc0..863398c 100644
--- a/cui/source/options/optgenrl.src
+++ b/cui/source/options/optgenrl.src
@@ -210,12 +210,6 @@ TabPage RID_SFXPAGE_GENERAL
 Hide = TRUE;
 Text [ en-US ] = Use data for document properties;
 };
-
-// extra resource for US addresses
-String STR_QUERY_REG
-{
-Text [ en-US ] = Note that street, Zip code and city are used to 
generate the registration key. You will not be able to change the user data 
again until the registration has been carried out. Do you want to modify the 
user data now?;
-};
 };
 
 // RID_SVXQB_CHANGEDATA ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/options/optgenrl.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 3c1345bdde10a3bbf179530576053578c810b7f6
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Aug 30 00:33:14 2012 +0100

try a stab at remote fix for no matching function for call to make_shared

Change-Id: I029df0a94158acc5ca9705f53070d39d297b7b17

diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 366ddda..0284902 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -45,6 +45,7 @@
 #include svx/dlgutil.hxx
 #include svx/svxids.hrc // SID_FIELD_GRABFOCUS
 
+#include boost/ref.hpp
 #include boost/make_shared.hpp
 
 namespace
@@ -267,7 +268,7 @@ void SvxGeneralTabPage::CreateControls ()
 continue;
 // creating row
 vRows.push_back(boost::make_sharedRow(
-*this, vRowInfo[iRow].nTextId, eRow
+boost::ref(*this), vRowInfo[iRow].nTextId, eRow
 ));
 Row rRow = *vRows.back();
 // fields in the row
@@ -281,7 +282,7 @@ void SvxGeneralTabPage::CreateControls ()
 {
 // creating edit field
 vFields.push_back(boost::make_sharedField(
-*this, vFieldInfo[iField].nEditId, iField
+boost::ref(*this), vFieldInfo[iField].nEditId, iField
 ));
 // short name field?
 if (vFieldInfo[iField].nEditId == ED_SHORTNAME)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

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

New commits:
commit 92f877ab098d2003581b73a5f0ec0f0038ef84cd
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Aug 30 00:52:33 2012 +0100

ever-annoying int != sal_Int32 problem

Change-Id: I07497cf288004931d4212e92decd18fb8c685a78

diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 0284902..c82c45c 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -377,7 +377,7 @@ void SvxGeneralTabPage::SetAccessibleNames ()
 if (iBracket != -1)
 sList = sList.copy(iBracket + 1, sLabel.lastIndexOf(')') - 
iBracket - 1);
 // cutting at '/'s
-int nIndex = 0;
+sal_Int32 nIndex = 0;
 for (unsigned iField = rRow.nFirstField; iField != rRow.nLastField; 
++iField)
 {
 // the token
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Libreoffice Gerrit user]

 cui/source/inc/cuioptgenrl.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 095b13bd230c97bf4c900f2b9a331927960dc6ed
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Aug 30 07:41:30 2012 +0200

-Werror,-Wmismatched-tags

Change-Id: Ia8242f98f2c1d4256bf84c6ad4f57f998d895d50

diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 4c54f88..0e05750 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -45,10 +45,10 @@ private:
 // the Use data for document properties checkbox (but where is it?)
 CheckBoxaUseDataCB;
 // rows
-class Row;
+struct Row;
 std::vectorboost::shared_ptrRow  vRows;
 // fields
-class Field;
+struct Field;
 std::vectorboost::shared_ptrField  vFields;
 // name fields
 unsigned nNameRow;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source sfx2/inc sw/source

[Libreoffice Gerrit user]

 cui/source/tabpages/swpossizetabpage.cxx |   17 -
 sfx2/inc/sfx2/htmlmode.hxx   |1 -
 sw/source/ui/config/viewopt.cxx  |9 +++--
 sw/source/ui/docvw/edtwin.cxx|3 +--
 sw/source/ui/frmdlg/frmpage.cxx  |   17 -
 sw/source/ui/ribbar/tbxanchr.cxx |4 +---
 sw/source/ui/shells/basesh.cxx   |4 +---
 sw/source/ui/shells/drwbassh.cxx |4 +---
 sw/source/ui/shells/textsh.cxx   |3 +--
 9 files changed, 16 insertions(+), 46 deletions(-)

New commits:
commit c184419d523a15fd875f0565e268158be27ac703
Author: Harri Pitkänen hatap...@iki.fi
Date:   Fri Aug 24 18:53:36 2012 +0300

Remove remaining checks for HTMLMODE_SOME_ABS_POS

This HTML mode is never disabled for any HTML export options. Thus
it is not necessary to check for it. Completes the cleanup started
in commit feeb57e0a63cdcd81898050d059e7933f62c5292

Change-Id: I3ea27ea52cdc355f19d0d2fb33ac92262df5d13f
Reviewed-on: https://gerrit.libreoffice.org/488
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com

diff --git a/cui/source/tabpages/swpossizetabpage.cxx 
b/cui/source/tabpages/swpossizetabpage.cxx
index 2eb6f25..caa95e0 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -894,14 +894,6 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet rSet)
 
 if(m_bHtmlMode)
 {
-if( 0 == (m_nHtmlMode  HTMLMODE_SOME_ABS_POS))
-{
-if(GetAnchorType() == TextContentAnchorType_AT_PAGE)
-{
-m_aToParaRB.Check();
-}
-m_aToPageRB.Enable(sal_False);
-}
 m_aHoriMirrorCB.Show(sal_False);
 m_aKeepRatioCB.Enable(sal_False);
 // #i18732# - hide checkbox in HTML mode
@@ -1227,8 +1219,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB )
 m_bAtVertPosModified = sal_True;
 
 // special treatment for HTML-Mode with horz-vert-dependencies
-if(m_bHtmlMode  m_nHtmlMode  HTMLMODE_SOME_ABS_POS 
-TextContentAnchorType_AT_CHARACTER == GetAnchorType())
+if(m_bHtmlMode  TextContentAnchorType_AT_CHARACTER == GetAnchorType())
 {
 sal_Bool bSet = sal_False;
 if(bHori)
@@ -1444,7 +1435,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor,
 if(m_bHtmlMode)
 {
 m_pVMap = aVParaHtmlMap;
-m_pHMap = m_nHtmlMode  HTMLMODE_SOME_ABS_POS ? aHParaHtmlAbsMap : 
aHParaHtmlMap;
+m_pHMap = aHParaHtmlAbsMap;
 }
 else
 {
@@ -1456,8 +1447,8 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor,
 {
 if(m_bHtmlMode)
 {
-m_pVMap = m_nHtmlMode  HTMLMODE_SOME_ABS_POS ? aVCharHtmlAbsMap   
 : aVCharHtmlMap;
-m_pHMap = m_nHtmlMode  HTMLMODE_SOME_ABS_POS ? aHCharHtmlAbsMap   
 : aHCharHtmlMap;
+m_pVMap = aVCharHtmlAbsMap;
+m_pHMap = aHCharHtmlAbsMap;
 }
 else
 {
diff --git a/sfx2/inc/sfx2/htmlmode.hxx b/sfx2/inc/sfx2/htmlmode.hxx
index 4d5393c..90af4b2 100644
--- a/sfx2/inc/sfx2/htmlmode.hxx
+++ b/sfx2/inc/sfx2/htmlmode.hxx
@@ -25,7 +25,6 @@
 #define HTMLMODE_SOME_STYLES0x0020 /* mind. MS IE */
 #define HTMLMODE_FULL_STYLES0x0040 /* == SW */
 #define HTMLMODE_PARA_BLOCK 0x0100
-#define HTMLMODE_SOME_ABS_POS   0x2000
 #define HTMLMODE_RESERVED1  0x4000
 #define HTMLMODE_RESERVED0  0x8000
 
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 18ab294..ff7d59a 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -326,16 +326,13 @@ sal_uInt16  GetHtmlMode(const SwDocShell* pShell)
 switch ( rHtmlOpt.GetExportMode() )
 {
 case HTML_CFG_MSIE:
-nRet |= HTMLMODE_FULL_STYLES|
-HTMLMODE_SOME_ABS_POS;
+nRet |= HTMLMODE_FULL_STYLES;
 break;
 case HTML_CFG_NS40:
-nRet |= HTMLMODE_FRM_COLUMNS|
-HTMLMODE_SOME_ABS_POS;
+nRet |= HTMLMODE_FRM_COLUMNS;
 break;
 case HTML_CFG_WRITER:
-nRet |= HTMLMODE_FRM_COLUMNS|HTMLMODE_FULL_STYLES|
-HTMLMODE_SOME_ABS_POS;
+nRet |= HTMLMODE_FRM_COLUMNS|HTMLMODE_FULL_STYLES;
 break;
 }
 }
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index bf24d48..2805bc2 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -1160,8 +1160,7 @@ void SwEditWin::ChangeFly( sal_uInt8 nDir, sal_Bool bWeb )
 }
 else
 {
-bSetPos = (::GetHtmlMode(rView.GetDocShell())  
HTMLMODE_SOME_ABS_POS) ?
-sal_True : 

[Libreoffice-commits] .: cui/source

[Andras Timar]

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

New commits:
commit a91805241c64694b0e4ba16b90edcf56fab2cf5a
Author: Andras Timar ati...@suse.com
Date:   Mon Aug 13 09:56:00 2012 +0200

wider listbox for language names

Change-Id: I2d7d742a393e5b44a2c7584e6a2b8c63ee04cd36

diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 4ae5397..fd1d6e1 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -94,7 +94,7 @@ TabDialog RID_OFA_AUTOCORR_DLG
 ListBox LB_LANG
 {
 Pos = MAP_APPFONT ( 150 , 3 ) ;
-Size = MAP_APPFONT ( 60 , 100 ) ;
+Size = MAP_APPFONT ( 80 , 100 ) ;
 DropDown = TRUE;
 TabStop = TRUE ;
 Border = TRUE ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source tools/inc tools/source unusedcode.easy vcl/inc vcl/source

[Caolán McNamara]

 cui/source/inc/transfrm.hxx  |1 
 cui/source/tabpages/transfrm.cxx |   64 -
 tools/inc/tools/contnr.hxx   |1 
 tools/source/memtools/contnr.cxx |  140 ---
 unusedcode.easy  |6 +
 vcl/inc/vcl/split.hxx|3 
 vcl/source/window/split.cxx  |7 -
 7 files changed, 5 insertions(+), 217 deletions(-)

New commits:
commit 0c0d24589f167f5f77f3d955ebfa3fc807ad38c4
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Aug 10 15:17:51 2012 +0100

callcatcher: reduce Container, update unused code list

Change-Id: I11733daf2668c4142052ceb4498f5500e7e291ef

diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index bb54fc7..cdcf618 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -157,7 +157,6 @@ private:
 DECL_LINK( ClickAutoHdl, void * );
 
 voidSetMaxSize( Rectangle aRect );
-Rectangle   GetRect();
 #endif
 
 public:
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 8f29c9d..57daf10 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -1535,70 +1535,6 @@ void SvxPositionSizeTabPage::DisableProtect()
 
 //
 
-Rectangle SvxPositionSizeTabPage::GetRect()
-{
-double fLeft(maRange.getMinX());
-double fTop(maRange.getMinY());
-double fRight(fLeft + (double)maMtrWidth.GetValue());
-double fBottom(fTop + (double)maMtrHeight.GetValue());
-
-switch ( maCtlSize.GetActualRP() )
-{
-case RP_LT:
-{
-break;
-}
-case RP_MT:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ) / 2.0;
-break;
-}
-case RP_RT:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() );
-break;
-}
-case RP_LM:
-{
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ) / 2.0;
-break;
-}
-case RP_MM:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ) / 2.0;
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ) / 2.0;
-break;
-}
-case RP_RM:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() );
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() ) / 2.0;
-break;
-}
-case RP_LB:
-{
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() );
-break;
-}
-case RP_MB:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() ) / 2.0;
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() );
-break;
-}
-case RP_RB:
-{
-fLeft = maRange.getMinX() - ( fRight - maRange.getMaxX() );
-fTop = maRange.getMinY() - ( fBottom - maRange.getMaxY() );
-break;
-}
-}
-
-return Rectangle(basegfx::fround(fLeft), basegfx::fround(fTop), 
basegfx::fround(fRight), basegfx::fround(fBottom));
-}
-
-//
-
 IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeWidthHdl)
 {
 if( maCbxScale.IsChecked()  maCbxScale.IsEnabled() )
diff --git a/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx
index 5096596..bf505f0 100644
--- a/tools/inc/tools/contnr.hxx
+++ b/tools/inc/tools/contnr.hxx
@@ -81,7 +81,6 @@ public:
 void*   Replace( void* pNew, void* pOld )
 { return Replace( pNew, GetPos( pOld ) ); }
 
-voidSetSize( sal_uIntPtr nNewSize );
 sal_uIntPtr   GetSize() const { return nCount; }
 
 sal_uIntPtr   Count() const { return nCount; }
diff --git a/tools/source/memtools/contnr.cxx b/tools/source/memtools/contnr.cxx
index 00c62aa..0b7c0d1 100644
--- a/tools/source/memtools/contnr.cxx
+++ b/tools/source/memtools/contnr.cxx
@@ -955,146 +955,6 @@ void* Container::Replace( void* p, sal_uIntPtr nIndex )
 
 /*
 |*
-|*Container::SetSize()
-|*
-*/
-
-void Container::SetSize( sal_uIntPtr nNewSize )
-{
-DBG_CHKTHIS( Container, DbgCheckContainer );
-
-if ( nNewSize )
-{
-// Unterscheiden sich die Groessen
-if ( nNewSize != nCount )
-{
-CBlock* pTemp;
-sal_uIntPtr nTemp;
-
-// Wird verkleinert
-if ( nNewSize  nCount )
-{
-pTemp = pFirstBlock;
-nTemp = 0;
-while ( (nTemp+pTemp-Count())  nNewSize )
-{
-nTemp += pTemp-Count();
-pTemp  = pTemp-GetNextBlock();
-   

[Libreoffice-commits] .: cui/source editeng/source svtools/Package_inc.mk svtools/source

[Caolán McNamara]

 cui/source/dialogs/commonlingui.hxx |1 
 cui/source/inc/SpellDialog.hxx  |1 
 editeng/source/editeng/edtspell.hxx |9 
 svtools/Package_inc.mk  |1 
 svtools/source/control/svxbox.cxx   |  612 
 5 files changed, 5 insertions(+), 619 deletions(-)

New commits:
commit 6c40ccd73c4f4cc3235a7a1c3de9e5990b0755f5
Author: Caolán McNamara caol...@redhat.com
Date:   Sat Jul 28 20:36:10 2012 +0100

svxbox.cxx unbuilt, svxbox.hxx unnecessarily included

so remove svxbox.?xx

Change-Id: I329b8468d05ea108ea9cfb57e3702cccfcc69227

diff --git a/cui/source/dialogs/commonlingui.hxx 
b/cui/source/dialogs/commonlingui.hxx
index 753db81..47e309a 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -23,7 +23,6 @@
 #include vcl/ctrl.hxx
 #include svtools/stdctrl.hxx
 #include vcl/edit.hxx
-#include svtools/svxbox.hxx
 #include vcl/button.hxx
 #include vcl/group.hxx
 #include vcl/dialog.hxx
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index b3152c6..c9cac11 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -43,7 +43,6 @@
 #include com/sun/star/uno/Reference.hxx
 
 
-#include svtools/svxbox.hxx
 #include svx/langbox.hxx
 #include memory
 #include svtools/svmedit.hxx
diff --git a/editeng/source/editeng/edtspell.hxx 
b/editeng/source/editeng/edtspell.hxx
index cd72c62..81e91a6 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -29,12 +29,13 @@
 #ifndef _EDTSPELL_HXX
 #define _EDTSPELL_HXX
 
-#include svtools/svxbox.hxx
-#include editeng/svxenum.hxx
-#include editeng/splwrap.hxx
-#include editeng/svxacorr.hxx
 #include com/sun/star/uno/Reference.h
 #include editeng/editengdllapi.h
+#include editeng/splwrap.hxx
+#include editeng/svxacorr.hxx
+#include editeng/svxenum.hxx
+#include tools/link.hxx
+#include vcl/outdev.hxx
 
 namespace com { namespace sun { namespace star { namespace linguistic2 {
 class XSpellChecker1;
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index b9102d1..a7ce3a1 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -142,7 +142,6 @@ $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/svtresid.hxx,svtools/s
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h))
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc))
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx))
-$(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/svxbox.hxx,svtools/svxbox.hxx))
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/syntaxhighlight.hxx,svtools/syntaxhighlight.hxx))
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/tabbar.hxx,svtools/tabbar.hxx))
 $(eval $(call 
gb_Package_add_file,svtools_inc,inc/svtools/table/tablecontrolinterface.hxx,svtools/table/tablecontrolinterface.hxx))
diff --git a/svtools/source/control/svxbox.cxx 
b/svtools/source/control/svxbox.cxx
deleted file mode 100644
index c5c4dad..000
--- a/svtools/source/control/svxbox.cxx
+++ /dev/null
@@ -1,612 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include vcl/svapp.hxx
-#include svtools/svxbox.hxx
-#include unotools/charclass.hxx
-
-// ---
-
-SV_IMPL_PTRARR(SvxEntryLst, SvxBoxEntry*)
-
-/*
- Beschreibung: Ein ListboxElement
- */
-
-SvxBoxEntry::SvxBoxEntry() :
-nId(LISTBOX_ENTRY_NOTFOUND),
-bModified(sal_False),
-bNew(sal_False)
-{
-}
-
-

[Libreoffice-commits] .: cui/source o3tl/inc sw/source

[Michael Stahl]

 cui/source/tabpages/autocdlg.cxx  |8 
 o3tl/inc/o3tl/sorted_vector.hxx   |5 -
 sw/source/core/doc/acmplwrd.cxx   |3 +--
 sw/source/core/doc/docfld.cxx |2 +-
 sw/source/core/docnode/nodes.cxx  |4 ++--
 sw/source/core/fields/fldlst.cxx  |2 +-
 sw/source/filter/html/htmlfly.cxx |2 +-
 7 files changed, 10 insertions(+), 16 deletions(-)

New commits:
commit f317119be32071e9ef82f3d8ff53170a5456ea0c
Author: Michael Stahl mst...@redhat.com
Date:   Wed Jul 25 16:21:05 2012 +0200

sorted_vector: MSVC doesn't know which erase to call

Change-Id: Ib81388db2f93db662bb5439565f311835b08073e

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index b2923f8..b770c8c 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1540,7 +1540,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet  
)
 if( !lcl_FindInArray(rArrays.aDoubleCapsStrings, *pString))
 {
   delete (*pWrdList)[ i ];
-  pWrdList-erase( pWrdList-begin() + i );
+  pWrdList-erase(i);
 }
 }
 
@@ -1565,7 +1565,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet  
)
 if( !lcl_FindInArray(rArrays.aAbbrevStrings, *pString))
 {
 delete (*pCplList)[ i ];
-pCplList-erase( pCplList-begin() + i );
+pCplList-erase(i);
 }
 }
 
@@ -1594,7 +1594,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet  
)
 if( USHRT_MAX == aDoubleCapsLB.GetEntryPos(*pString) )
 {
 delete (*pWrdList)[ i ];
-pWrdList-erase( pWrdList-begin() + i );
+pWrdList-erase(i);
 }
 }
 nCount = aDoubleCapsLB.GetEntryCount();
@@ -1619,7 +1619,7 @@ sal_Bool OfaAutocorrExceptPage::FillItemSet( SfxItemSet  
)
 if( USHRT_MAX == aAbbrevLB.GetEntryPos(*pString) )
 {
 delete (*pCplList)[ i ];
-pCplList-erase( pCplList-begin() + i );
+pCplList-erase(i);
 }
 }
 nCount = aAbbrevLB.GetEntryCount();
diff --git a/o3tl/inc/o3tl/sorted_vector.hxx b/o3tl/inc/o3tl/sorted_vector.hxx
index bf1cca5..48ad0bc 100644
--- a/o3tl/inc/o3tl/sorted_vector.hxx
+++ b/o3tl/inc/o3tl/sorted_vector.hxx
@@ -68,11 +68,6 @@ public:
 }
 
 // hack: public erase with const_iterator, should not change sort order
-void erase(const_iterator const position)
-{
-base_t::erase(begin_nonconst() + (position - begin()));
-}
-
 void erase(const_iterator const first, const_iterator const last)
 {
 base_t::erase(begin_nonconst() + (first - begin()),
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 20a43ad..f7ff984 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -320,7 +320,7 @@ void SwAutoCompleteWord::SetMaxCount( sal_uInt16 nNewMax )
 m_WordList.find(aLRULst[ nLRUIndex++ ]);
 OSL_ENSURE( m_WordList.end() != it, String not found );
 editeng::IAutoCompleteString *const pDel = *it;
-m_WordList.erase(it);
+m_WordList.erase(it - m_WordList.begin());
 delete pDel;
 }
 aLRULst.erase( aLRULst.begin() + nNewMax - 1, aLRULst.end() );
@@ -383,7 +383,6 @@ void SwAutoCompleteWord::CheckChangedList(
 SwAutoCompleteString *const pDel =
 dynamic_castSwAutoCompleteString*(m_WordList[nMyPos]);
 m_WordList.erase(nMyPos);
-
 SwAutoCompleteStringPtrDeque::iterator it = std::find( 
aLRULst.begin(), aLRULst.end(), pDel );
 OSL_ENSURE( aLRULst.end() != it, String not found );
 aLRULst.erase( it );
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index a8ae938..6f1fdf6 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2191,7 +2191,7 @@ void SwDocUpdtFld::InsDelFldInFldLst( sal_Bool bIns, 
const SwTxtFld rFld )
 if( rFld == (*pFldSortLst)[ n ]-GetPointer() )
 {
 delete (*pFldSortLst)[n];
-pFldSortLst-erase( pFldSortLst-begin() + n );
+pFldSortLst-erase(n);
 n--; // one field can occur multiple times
 }
 }
diff --git a/sw/source/core/docnode/nodes.cxx b/sw/source/core/docnode/nodes.cxx
index d8d53e5..400fe2d 100644
--- a/sw/source/core/docnode/nodes.cxx
+++ b/sw/source/core/docnode/nodes.cxx
@@ -1226,7 +1226,7 @@ void SwNodes::Delete(const SwNodeIndex rIndex, sal_uLong 
nNodes)
 pOutlineNds-Seek_Entry( pNd, nIdxPos ))
 {
 // loesche die 

[Libreoffice-commits] .: cui/source

[Stephan Bergmann]

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

New commits:
commit 6a90d4ec8afd1e58c9b69f4de1364d5b5624300b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Jul 23 16:28:22 2012 +0200

-Werror=sign-compare

Change-Id: I6be5df685575c6909d4adfcee0ccc4fb0bd4b600

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 7bbc437..5c90b65 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1033,7 +1033,7 @@ unsigned ColorConfigWindow_Impl::GetPosBehindLastChapter 
() const
 long ColorConfigWindow_Impl::GetDeltaAbove (Group eGroup) const
 {
 long nDelta = 0;
-for (unsigned i = 0; i != eGroup; ++i)
+for (int i = 0; i != eGroup; ++i)
 if (!IsGroupVisible(static_castGroup(i)))
 nDelta += vChapters[i]-GetHeight();
 return nDelta;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Michael Meeks]

 cui/source/options/optcolor.cxx |   26 --
 1 file changed, 12 insertions(+), 14 deletions(-)

New commits:
commit 7ba03350e8392f1b7de7cf0258ab5b45c63483e4
Author: Michael Meeks michael.me...@suse.com
Date:   Mon Jul 23 19:48:37 2012 +0100

attempt to fix compile by avoiding make_shared.

Change-Id: Id34b1cca10108334533eb900f5a1cf03c93fb0f4

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 5c90b65..ece061a 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -36,7 +36,6 @@
 #include unotools/pathoptions.hxx
 #include vcl/msgbox.hxx
 #include boost/shared_ptr.hpp
-#include boost/make_shared.hpp
 #include svx/svxdlg.hxx
 #include helpid.hrc
 #include dialmgr.hxx
@@ -464,15 +463,15 @@ ColorConfigWindow_Impl::Entry::Entry (
 // has checkbox?
 if (vEntryInfo[iEntry].bCheckBox)
 {
-pText = boost::make_sharedCheckBox(
+pText = boost::shared_ptrCheckBox( new CheckBox (
 rParent, ResId(vEntryInfo[iEntry].nTextResId, rResMgr)
-);
+) );
 }
 else
 {
-pText = boost::make_sharedFixedText(
+pText = boost::shared_ptrFixedText( new FixedText (
 rParent, ResId(vEntryInfo[iEntry].nTextResId, rResMgr)
-);
+) );
 }
 }
 
@@ -481,7 +480,7 @@ ColorConfigWindow_Impl::Entry::Entry (
 Window rParent, ResMgr rResMgr,
 unsigned nYPos, ExtendedColorConfigValue const aColorEntry
 ) :
-pText(boost::make_sharedFixedText(rParent, ResId(FT_BASICERROR, 
rResMgr))),
+pText(boost::shared_ptrFixedText(new FixedText (rParent, 
ResId(FT_BASICERROR, rResMgr,
 aColorList(rParent, ResId(LB_BASICERROR, rResMgr)),
 aPreview(rParent, ResId(WN_BASICERROR, rResMgr)),
 aDefaultColor(aColorEntry.getDefaultColor())
@@ -692,15 +691,14 @@ void ColorConfigWindow_Impl::CreateEntries (ResMgr 
rResMgr)
 vChapters.reserve(nGroupCount);
 for (unsigned i = 0; i != nGroupCount; ++i)
 {
-vChapters.push_back(boost::make_sharedChapter(
-*this, static_castGroup(i), rResMgr
-));
+vChapters.push_back(boost::shared_ptrChapter (
+new Chapter( *this, static_castGroup(i), rResMgr ) ) );
 }
 
 // creating entries
 vEntries.reserve(ColorConfigEntryCount);
 for (unsigned i = 0; i != ColorConfigEntryCount; ++i)
-vEntries.push_back(boost::make_sharedEntry(*this, i, rResMgr));
+vEntries.push_back( boost::shared_ptrEntry(new Entry (*this, i, 
rResMgr) ) );
 
 // calculate heights of groups which can be hidden
 {
@@ -722,19 +720,19 @@ void ColorConfigWindow_Impl::CreateEntries (ResMgr 
rResMgr)
 for (unsigned j = 0; j != nExtGroupCount; ++j)
 {
 rtl::OUString const sComponentName = 
aExtConfig.GetComponentName(j);
-vChapters.push_back(boost::make_sharedChapter(
+vChapters.push_back(boost::shared_ptrChapter(new Chapter (
 *this, rResMgr, nLineNum * LINE_HEIGHT,
 aExtConfig.GetComponentDisplayName(sComponentName)
-));
+)));
 ++nLineNum;
 unsigned nColorCount = 
aExtConfig.GetComponentColorCount(sComponentName);
 for (unsigned i = 0; i != nColorCount; ++i)
 {
 ExtendedColorConfigValue const aColorEntry =
 aExtConfig.GetComponentColorConfigValue(sComponentName, i);
-vEntries.push_back(boost::make_sharedEntry(
+vEntries.push_back(boost::shared_ptrEntry( new Entry (
 *this, rResMgr, nLineNum * LINE_HEIGHT, aColorEntry
-));
+)));
 ++nLineNum;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Jan Holesovsky]

 cui/source/dialogs/about.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8722e6f55b3625fb410f1aedf40ed8d0eb2612f0
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

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index cdf63a5..b45f686 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -204,6 +204,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] .: cui/source

[Ivan Timofeev]

 cui/source/customize/macropg.src |2 +-
 cui/source/tabpages/macroass.src |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 19406a2d3325070ad5c309676b74fc6d6d92c76c
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sat Jul 14 19:35:32 2012 +0400

fix remaining tab pages

see f70fe6e651eefbc69c434256f7e74ad53519a36c

Change-Id: Ic4cf70997af986dea387b0bdde86ae59ff4be401

diff --git a/cui/source/customize/macropg.src b/cui/source/customize/macropg.src
index 726f8e4..ae3601c 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 68665f5..dc314c7 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] .: cui/source vcl/source

[Jan Holesovsky]

 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 debfb21c927e39ab18aafb1895f343840967e16a
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

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 6dc820d..cdf63a5 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -74,7 +74,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() 
) ),
@@ -191,15 +191,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] .: cui/source

[Andras Timar]

 cui/source/dialogs/about.cxx |1 -
 cui/source/dialogs/about.hrc |1 -
 cui/source/dialogs/about.src |4 
 cui/source/inc/about.hxx |1 -
 4 files changed, 7 deletions(-)

New commits:
commit c015b4ae380e65f3d1169aac33ff96335935ba78
Author: Andras Timar ati...@suse.com
Date:   Thu Jul 12 15:22:20 2012 +0200

cleanup of m_aWebsiteLinkStr in About box code (fdo#52000)

Change-Id: Ie4b7325eb238064540681d5e19e5d2e7666f094d

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 8ba491c..21e4592 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -82,7 +82,6 @@ AboutDialog::AboutDialog( Window* pParent, const ResId rId) :
 m_aCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT, *rId.GetResMgr())),
 m_aBasedTextStr(ResId(ABOUT_STR_BASED, *rId.GetResMgr())),
 m_aBasedDerivedTextStr(ResId(ABOUT_STR_BASED_DERIVED, *rId.GetResMgr())),
-m_aWebsiteLinkStr(ResId( ABOUT_STR_LINK_WEBSITE, *rId.GetResMgr())),
 m_aCreditsLinkStr(ResId( ABOUT_STR_LINK_CREDITS, *rId.GetResMgr())),
 m_sBuildStr(ResId(ABOUT_STR_BUILD, *rId.GetResMgr())),
 m_aDescriptionTextStr(ResId(ABOUT_STR_DESCRIPTION, *rId.GetResMgr()))
diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc
index 6ad08e7..0afbe0b 100644
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@ -24,7 +24,6 @@
 #define ABOUT_STR_COPYRIGHT 4
 #define ABOUT_STR_BASED 5
 #define ABOUT_STR_BASED_DERIVED 6
-#define ABOUT_STR_LINK_WEBSITE  7
 #define ABOUT_STR_LINK_CREDITS  8
 #define ABOUT_BTN_CREDITS   10
 #define ABOUT_DESCRIPTION_TEXT  11
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 63c5f2c..ab853c6 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -97,10 +97,6 @@ ModalDialog RID_DEFAULTABOUT
 {
 Text[ en-US ] = (Build ID: $BUILDID);
 };
-String ABOUT_STR_LINK_WEBSITE
-{
-Text[ en-US ] = http://www.libreoffice.org;;
-};
 String ABOUT_STR_LINK_CREDITS
 {
 Text[ en-US ] = http://www.libreoffice.org/about-us/credits/;;
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 6394908..783a261 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -61,7 +61,6 @@ private:
 String m_aCopyrightTextStr;
 String m_aBasedTextStr;
 String m_aBasedDerivedTextStr;
-String m_aWebsiteLinkStr;
 String m_aCreditsLinkStr;
 rtl::OUString m_sBuildStr;
 String m_aDescriptionTextStr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Miklos Vajna]

 cui/source/dialogs/about.cxx |   28 +++-
 1 file changed, 3 insertions(+), 25 deletions(-)

New commits:
commit 28d8b54c142df38b94079cf0d93f09c2a008459b
Author: Miklos Vajna vmik...@suse.cz
Date:   Thu Jul 12 16:19:37 2012 +0200

about dialog: use new configmgr api

Change-Id: Ife65c0d9417c31e80d11e2e97ffd06765d90fb1e

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 21e4592..6dc820d 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -56,6 +56,7 @@
 #include rtl/ustrbuf.hxx
 #include vcl/bitmap.hxx
 #include vcl/rendergraphicrasterizer.hxx
+#include officecfg/Office/Common.hxx
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
@@ -124,31 +125,8 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton )
 sURL = m_aCreditsLinkStr;
 else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
 {
-try
-{
-Referencelang::XMultiServiceFactory xConfig( 
comphelper::getProcessServiceFactory()-createInstance(rtl::OUString( 
com.sun.star.configuration.ConfigurationProvider )),UNO_QUERY);
-if( xConfig.is() )
-{
-SequenceAny args(1);
-PropertyValue val(
-rtl::OUString( nodepath ),
-0,
-Any(rtl::OUString( 
/org.openoffice.Office.Common/Help/StartCenter )),
-PropertyState_DIRECT_VALUE);
-args.getArray()[0] = val;
-Referencecontainer::XNameAccess 
xNameAccess(xConfig-createInstanceWithArguments(rtl::OUString( 
com.sun.star.configuration.ConfigurationAccess ),args), UNO_QUERY);
-if( xNameAccess.is() )
-{
-//throws css::container::NoSuchElementException, 
css::lang::WrappedTargetException
-Any value( xNameAccess-getByName(rtl::OUString( InfoURL 
)) );
-sURL = value.getrtl::OUString ();
-localizeWebserviceURI(sURL);
-}
-}
-}
-catch (const Exception)
-{
-}
+sURL = officecfg::Office::Common::Help::StartCenter::InfoURL::get();
+localizeWebserviceURI(sURL);
 }
 
 // If the URL is empty, don't do anything
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source extensions/source filter/source sc/source sd/source sfx2/source slideshow/source svtools/source svx/source sw/source tools/inc tools/Package_inc.mk tools/source vcl

[Muthu Subramanian]

 cui/source/dialogs/cuigrfflt.cxx |1 
 cui/source/inc/cuigrfflt.hxx |2 
 extensions/source/scanner/scanwin.cxx|2 
 filter/source/graphicfilter/icgm/bundles.cxx |1 
 filter/source/pdf/pdfexport.cxx  |1 
 filter/source/svg/svgwriter.cxx  |1 
 filter/source/svg/svgwriter.hxx  |1 
 sc/source/ui/view/overlayobject.cxx  |1 
 sd/source/ui/annotations/annotationwindow.cxx|2 
 sd/source/ui/app/optsitem.cxx|2 
 sd/source/ui/func/fuoaprms.cxx   |2 
 sd/source/ui/view/drviews8.cxx   |2 
 sd/source/ui/view/grviewsh.cxx   |2 
 sfx2/source/doc/graphhelp.cxx|2 
 sfx2/source/view/ipclient.cxx|1 
 slideshow/source/engine/shapes/drawinglayeranimation.cxx |2 
 slideshow/source/engine/shapes/viewmediashape.cxx|1 
 svtools/source/filter/wmf/emfwr.cxx  |2 
 svtools/source/filter/wmf/wmfwr.cxx  |2 
 svtools/source/graphic/grfmgr.cxx|2 
 svtools/source/graphic/provider.cxx  |1 
 svx/source/dialog/_contdlg.cxx   |2 
 svx/source/gallery2/galobj.cxx   |2 
 svx/source/sdr/overlay/overlayanimatedbitmapex.cxx   |1 
 svx/source/sdr/overlay/overlaybitmapex.cxx   |1 
 svx/source/sdr/overlay/overlaycrosshair.cxx  |1 
 svx/source/sdr/overlay/overlayhelpline.cxx   |1 
 svx/source/sdr/overlay/overlayline.cxx   |1 
 svx/source/sdr/overlay/overlaymanager.cxx|1 
 svx/source/sdr/overlay/overlaymanagerbuffered.cxx|1 
 svx/source/sdr/overlay/overlayobject.cxx |1 
 svx/source/sdr/overlay/overlaypolypolygon.cxx|1 
 svx/source/sdr/overlay/overlayrollingrectangle.cxx   |1 
 svx/source/sdr/overlay/overlaytriangle.cxx   |1 
 svx/source/svdraw/gradtrns.cxx   |2 
 svx/source/svdraw/sdrpagewindow.cxx  |2 
 svx/source/svdraw/svdfmtf.cxx|2 
 svx/source/svdraw/svdoashp.cxx   |2 
 svx/source/svdraw/svdobj.cxx |2 
 svx/source/svdraw/svdocapt.cxx   |2 
 svx/source/svdraw/svdograf.cxx   |2 
 svx/source/svdraw/svdopath.cxx   |2 
 svx/source/svdraw/svdotext.cxx   |2 
 svx/source/svdraw/svdotextdecomposition.cxx  |2 
 svx/source/svdraw/svdotextpathdecomposition.cxx  |1 
 svx/source/svdraw/svdpage.cxx|2 
 svx/source/svdraw/svdpoev.cxx|2 
 svx/source/table/tablehandles.cxx|1 
 svx/source/xoutdev/_xpoly.cxx|2 
 sw/source/core/graphic/ndgrf.cxx |2 
 sw/source/core/layout/fly.cxx|2 
 sw/source/filter/rtf/swparrtf.cxx|2 
 tools/Package_inc.mk |1 
 tools/inc/tools/gen.hxx  |   30 -
 tools/inc/tools/helpers.hxx  |   33 +++
 tools/source/generic/line.cxx|1 
 tools/source/generic/poly.cxx|1 
 vcl/generic/glyphs/glyphcache.cxx|1 
 vcl/inc/vcl/salbtype.hxx |2 
 vcl/source/app/sound.cxx |5 --
 vcl/source/gdi/cvtsvm.cxx|2 
 vcl/source/gdi/impanmvw.cxx  |2 
 vcl/source/gdi/impgraph.cxx  |2 
 vcl/source/gdi/metaact.cxx   |2 
 vcl/source/gdi/print2.cxx|1 
 vcl/source/gdi/regband.cxx   |3 -
 vcl/source/gdi/region.cxx|1 
 vcl/unx/generic/app/saldisp.cxx  |1 
 vcl/unx/generic/app/soicon.cxx   |1 
 xmloff/source/draw/shapeexport2.cxx  |2 
 xmloff/source/draw/shapeexport3.cxx  |2 
 xmloff/source/draw/xexptran.cxx  |2 
 72 files changed, 79 insertions(+), 98 deletions(-)

New commits:
commit 739e20ac58983925f2076a9848435b7d4fb5366a
Author: Matteo Casalin matteo.casa...@gmx.com
Date:   Sun Jul 1 01:06:04 2012 +0200

Decrease 

[Libreoffice-commits] .: cui/source svtools/source svx/inc svx/source

[Eike Rathke]

 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 02b435f235d2863ee344054262200152edbba3a3
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 6317c83..06e2329 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 0882cf2..dfb5bca 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 bfcb511..09f8163 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -349,6 +349,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 );
@@ -385,6 +389,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] .: cui/source i18nutil/inc i18nutil/source

[Ivan Timofeev]

 cui/source/tabpages/page.cxx  |4 ++--
 cui/source/tabpages/page.h|1 +
 cui/source/tabpages/page.src  |1 +
 i18nutil/inc/i18nutil/paper.hxx   |5 +++--
 i18nutil/source/utility/paper.cxx |3 ++-
 5 files changed, 9 insertions(+), 5 deletions(-)

New commits:
commit b8c5f6577911ebb15ad7eb7f60ad5bb9d8d37f0b
Author: Rob Snelders programm...@ertai.nl
Date:   Thu Jul 5 20:45:15 2012 +0200

fdo#42986 - UI wide screen format (16:10): Add Page size

Change-Id: Ie769c9a65e85f91395b3495fadb6f5e688cbe9af

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 0c5ea75..ecdc05f 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -997,7 +997,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox 
*, pBox )
 {
 // Draw: if paper format the margin shall be 1 cm
 long nTmp = 0;
-sal_Bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )|| ( 
PAPER_SCREEN_16_9 == ePaper));
+sal_Bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )||( 
PAPER_SCREEN_16_9 == ePaper)||( PAPER_SCREEN_16_10 == ePaper));
 
 if ( !bScreen )
 // no margin if screen
@@ -1408,7 +1408,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
 sal_uInt16 nPos = aPaperSizeBox.GetSelectEntryPos();
 Paper ePaper = (Paper)(sal_uLong)aPaperSizeBox.GetEntryData( nPos );
 
-if ( ePaper != PAPER_SCREEN_4_3  ePaper != PAPER_SCREEN_16_9  
IsMarginOutOfRange() )
+if ( ePaper != PAPER_SCREEN_4_3  ePaper != PAPER_SCREEN_16_9  ePaper 
!= PAPER_SCREEN_16_10  IsMarginOutOfRange() )
 {
 if ( QueryBox( this, WB_YES_NO | WB_DEF_NO, aPrintRangeQueryText 
).Execute() == RET_NO )
 {
diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
index 58ebb4e..7630200 100644
--- a/cui/source/tabpages/page.h
+++ b/cui/source/tabpages/page.h
@@ -66,6 +66,7 @@
 #define PAPERSIZE_POSTCARD_JP   46
 #define PAPERSIZE_A656
 #define PAPERSIZE_SCREEN_16_9   78
+#define PAPERSIZE_SCREEN_16_10  79
 
 #endif
 
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 0397b2d..0026f9a 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -470,6 +470,7 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
  Dia Slide ; PAPERSIZE_DIA ;  ;
  Screen 4:3 ; PAPERSIZE_SCREEN_4_3 ;  ;
  Screen 16:9 ; PAPERSIZE_SCREEN_16_9 ;  ;
+ Screen 16:10 ; PAPERSIZE_SCREEN_16_10 ;  ;
  Japanese Postcard ; PAPERSIZE_POSTCARD_JP;  ;
 };
 };
diff --git a/i18nutil/inc/i18nutil/paper.hxx b/i18nutil/inc/i18nutil/paper.hxx
index 98b88bd..65ebb38 100644
--- a/i18nutil/inc/i18nutil/paper.hxx
+++ b/i18nutil/inc/i18nutil/paper.hxx
@@ -117,11 +117,12 @@ enum Paper
 PAPER_ARCHC,
 PAPER_ARCHD,
 PAPER_ARCHE,
-PAPER_SCREEN_16_9
+PAPER_SCREEN_16_9,
+PAPER_SCREEN_16_10
 };
 
 // defined for 'equal size' test with the implementation array
-#define NUM_PAPER_ENTRIES   (PAPER_SCREEN_16_9 - PAPER_A0 + 1)
+#define NUM_PAPER_ENTRIES   (PAPER_SCREEN_16_10 - PAPER_A0 + 1)
 
 // -
 // - Paper -
diff --git a/i18nutil/source/utility/paper.cxx 
b/i18nutil/source/utility/paper.cxx
index 8f4fb91..e67cf74 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -154,7 +154,8 @@ static PageDesc aDinTab[] =
 { IN2MM100( 18 ),IN2MM100( 24 ), ARCHC,  NULL },
 { IN2MM100( 24 ),IN2MM100( 36 ), ARCHD,  NULL },
 { IN2MM100( 36 ),IN2MM100( 48 ), ARCHE,  NULL },
-{ MM2MM100( 157.5),  MM2MM100( 280 ),NULL,  NULL } //Screen 16:9
+{ MM2MM100( 157.5),  MM2MM100( 280 ),NULL,  NULL }, //Screen 16:9
+{ MM2MM100( 175 ),   MM2MM100( 280 ),NULL,  NULL }  //Screen 16:10
 
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source svtools/inc svtools/source

[Andras Timar]

 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 5a27543e41ec7a167d51ea4e7e2f1f5b658f667b
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 dd9c9d2..a41e842 100644
--- a/cui/source/dialogs/svuidlg.hrc
+++ b/cui/source/dialogs/svuidlg.hrc
@@ -33,7 +33,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 869eed9..4264f21 100644
--- a/svtools/inc/svtools/sores.hxx
+++ b/svtools/inc/svtools/sores.hxx
@@ -18,27 +18,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 357942c..0319175 100644
--- a/svtools/source/dialogs/so3res.src
+++ b/svtools/source/dialogs/so3res.src
@@ -176,66 +176,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. ;
-};
-String STR_ERROR_DDE
-{
-Text [ en-US ] = DDE link to % for % area 

[Libreoffice-commits] .: cui/source

[Caolán McNamara]

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

New commits:
commit e41a630bc8aa93a104d56820862e28386805197a
Author: Caolán McNamara caol...@redhat.com
Date:   Wed Jun 20 12:42:52 2012 +0100

make space for radiobuttons in cert dialog a bit bigger

Change-Id: I0726d3ea1661d00495e87897746d3baaf768c170

diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 417ab1f..667e72b 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -60,7 +60,7 @@ CertPathDialog::CertPathDialog( Window* pParent ) :
 {
 static long aStaticTabs[]=
 {
-3, 0, 10, 70
+3, 0, 15, 75
 };
 
 m_aCertPathList.SvxSimpleTable::SetTabs( aStaticTabs );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Petr Mladek]

 cui/source/dialogs/about.cxx |   99 +++
 cui/source/inc/about.hxx |6 +-
 2 files changed, 66 insertions(+), 39 deletions(-)

New commits:
commit c3ef1efe476771206baad6ee763e9e9397b7cf3d
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date:   Thu Jun 7 23:50:37 2012 +0200

Fix display of About dialog when buttons contain long strings

Thanks to Jean-Baptiste Faure for spotting.

Change-Id: Ie05a15fca7f40c9a621a6aa758a19f7455d312a6

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index ddf296f..c8576ab 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -63,8 +63,8 @@ using namespace ::com::sun::star;
 enum AboutDialogButton
 {
 CREDITS_BUTTON,
-WEBSITE_BUTTON,
-LICENSE_BUTTON
+LICENSE_BUTTON,
+WEBSITE_BUTTON
 };
 
 AboutDialog::AboutDialog( Window* pParent, const ResId rId) :
@@ -103,13 +103,13 @@ AboutDialog::AboutDialog( Window* pParent, const ResId 
rId) :
 
 // Allow the button to be identifiable once they are clicked
 aCreditsButton.SetData( (void*)CREDITS_BUTTON );
-aWebsiteButton.SetData( (void*)WEBSITE_BUTTON );
 aLicenseButton.SetData( (void*)LICENSE_BUTTON );
+aWebsiteButton.SetData( (void*)WEBSITE_BUTTON );
 
 // Connect all handlers
 aCreditsButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
-aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
 aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
+aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
 
 aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) );
 
@@ -127,10 +127,10 @@ IMPL_LINK( AboutDialog, HandleClick, PushButton*, pButton 
)
 AboutDialogButton* pDialogButton = (AboutDialogButton*)pButton-GetData();
 if ( pDialogButton ==  (AboutDialogButton*)CREDITS_BUTTON )
 sURL = m_aCreditsLinkStr;
-else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
-sURL = m_aWebsiteLinkStr;
 else if ( pDialogButton == (AboutDialogButton*)LICENSE_BUTTON)
 sURL = m_aLicenseLinkStr;
+else if ( pDialogButton == (AboutDialogButton*)WEBSITE_BUTTON )
+sURL = m_aWebsiteLinkStr;
 
 // If the URL is empty, don't do anything
 if ( sURL.isEmpty() )
@@ -195,26 +195,24 @@ void AboutDialog::LayoutControls()
 // Obtain an appropriate text width from the size of the screen
 sal_Int32 aIdealTextWidth = aScreenRect.GetWidth() / 2.4;
 
-sal_Int32 aDialogBorder = 6;
-sal_Int32 aContentWidth = aIdealTextWidth + aDialogBorder * 2;
-sal_Int32 aShadowWidth = aContentWidth * 0.02;
-sal_Int32 aDialogWidth = aContentWidth + aShadowWidth * 2;
+sal_Int32 aDialogBorder = 12;
+sal_Int32 aDialogWidth = aIdealTextWidth + aDialogBorder * 2;
 
 // Render and Position Logo
 vcl::RenderGraphicRasterizer aRasterizerLogo = 
Application::LoadBrandSVG(flat_logo);
 float aLogoWidthHeightRatio = 
(float)aRasterizerLogo.GetDefaultSizePixel().Width() /

(float)aRasterizerLogo.GetDefaultSizePixel().Height();
 
-Size aLogoSize( aContentWidth * 0.6, (aContentWidth * 0.6) / 
aLogoWidthHeightRatio );
-Point aLogoPos( aShadowWidth + ( aContentWidth - aLogoSize.Width() ) / 2,
-aShadowWidth + aDialogBorder );
+Size aLogoSize( aDialogWidth * 0.6, (aDialogWidth * 0.6) / 
aLogoWidthHeightRatio );
+Point aLogoPos( ( aDialogWidth - aLogoSize.Width() ) / 2,
+aDialogBorder );
 aLogoBitmap = aRasterizerLogo.Rasterize( aLogoSize );
 aLogoImage.SetImage( Image( aLogoBitmap ) );
 aLogoImage.SetPosSizePixel( aLogoPos, aLogoSize );
 
 // Position version text
 sal_Int32 aLogoVersionSpacing = aLogoSize.Height() * 0.15;
-Point aVersionPos( aShadowWidth + aDialogBorder,
+Point aVersionPos( aDialogBorder,
aLogoPos.Y() + aLogoSize.Height() + aLogoVersionSpacing 
);
 Size aVersionSize = aVersionText.CalcMinimumSize();
 aVersionSize.Width() = aIdealTextWidth;
@@ -222,7 +220,7 @@ void AboutDialog::LayoutControls()
 
 // Position description text
 sal_Int32 aVersionDescriptionSpacing = aLogoSize.Height() * 0.45;
-Point aDescriptionPos( aShadowWidth + aDialogBorder, aVersionPos.Y() + 
aVersionSize.Height() + aVersionDescriptionSpacing );
+Point aDescriptionPos( aDialogBorder, aVersionPos.Y() + 
aVersionSize.Height() + aVersionDescriptionSpacing );
 Size aDescriptionSize = aDescriptionText.GetSizePixel();
 aDescriptionSize.Width() = aIdealTextWidth;
 aDescriptionText.SetPosSizePixel( aDescriptionPos, aDescriptionSize );
@@ -230,7 +228,7 @@ void AboutDialog::LayoutControls()
 aDescriptionText.SetSizePixel( aDescriptionSize );
 
 // Layout copyright text
-Point aCopyrightPos( aShadowWidth + aDialogBorder, aDescriptionPos.Y() + 
aDescriptionText.GetSizePixel().Height() + 

[Libreoffice-commits] .: cui/source

[Tomaž Vajngerl]

 cui/source/dialogs/cuigrfflt.cxx |   27 +--
 cui/source/inc/cuigrfflt.hxx |2 +-
 2 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit dc068d34271d070267e61f4761aebf8ccaabf299
Author: Tomaž Vajngerl qui...@gmail.com
Date:   Sun Jun 17 15:41:46 2012 +0200

Filter dialog preview image size was wrongly calculated in some cases.

Change-Id: I22fdf17e6f2112624963da6293efddfa75507dd7

diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index f074e17..0b846cb 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -59,15 +59,22 @@ void GraphicFilterDialog::PreviewWindow::Paint( const 
Rectangle rRect )
 {
 Control::Paint( rRect );
 
-const Size  aGrfSize( LogicToPixel( maGraphic.GetPrefSize(), 
maGraphic.GetPrefMapMode() ) );
-const Size  aOutSize( GetOutputSizePixel() );
-const Point aGrfPos( ( aOutSize.Width() - aGrfSize.Width() )  1,
- ( aOutSize.Height() - aGrfSize.Height() )  1 );
+const Size  aOutputSize( GetOutputSizePixel() );
 
 if( maGraphic.IsAnimated() )
-maGraphic.StartAnimation( this , aGrfPos, aGrfSize );
+{
+const Size  aGraphicSize( LogicToPixel( maGraphic.GetPrefSize(), 
maGraphic.GetPrefMapMode() ) );
+const Point aGraphicPosition( ( aOutputSize.Width()  - 
aGraphicSize.Width()  )  1,
+  ( aOutputSize.Height() - 
aGraphicSize.Height() )  1 );
+maGraphic.StartAnimation( this, aGraphicPosition, aGraphicSize );
+}
 else
-maGraphic.Draw( this, aGrfPos, aGrfSize );
+{
+const Size  aGraphicSize( maGraphic.GetSizePixel() );
+const Point aGraphicPosition( ( aOutputSize.Width()  - 
aGraphicSize.Width()  )  1,
+  ( aOutputSize.Height() - 
aGraphicSize.Height() )  1 );
+maGraphic.Draw( this, aGraphicPosition, aGraphicSize );
+}
 }
 
 // 
-
@@ -110,13 +117,13 @@ GraphicFilterDialog::GraphicFilterDialog( Window* 
pParent, const ResId rResId,
 
 if( fGrfWH  fPreWH )
 {
-aGrfSize.Width() = (long) ( aPreviewSize.Height() * fGrfWH );
-aGrfSize.Height()= aPreviewSize.Height();
+aGrfSize.Width()  = (long) ( aPreviewSize.Height() * fGrfWH );
+aGrfSize.Height() = aPreviewSize.Height();
 }
 else
 {
-aGrfSize.Width() = aPreviewSize.Width();
-aGrfSize.Height()= (long) ( aPreviewSize.Width() / fGrfWH);
+aGrfSize.Width()  = aPreviewSize.Width();
+aGrfSize.Height() = (long) ( aPreviewSize.Width() / fGrfWH );
 }
 
 mfScaleX = (double) aGrfSize.Width() / maSizePixel.Width();
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 98303e0..f9cb624 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -53,7 +53,7 @@ private:
 {
 private:
 
-GraphicObject   maGraphic;
+Graphic   maGraphic;
 
 virtual voidPaint( const Rectangle rRect );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Andras Timar]

 cui/source/dialogs/about.cxx |2 +-
 cui/source/inc/about.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 097c9f295170db829a891ad999eb0dd40267
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] .: cui/source framework/source sc/source svx/source vcl/inc vcl/source

[Tor Lillqvist]

 cui/source/customize/cfg.cxx|1 +
 framework/source/services/backingwindow.cxx |1 +
 sc/source/ui/cctrl/tbzoomsliderctrl.cxx |1 +
 svx/source/dialog/_contdlg.cxx  |1 +
 vcl/inc/vcl/toolbox.hxx |2 --
 vcl/source/window/toolbox.cxx   |2 --
 vcl/source/window/window.cxx|1 +
 7 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 10ff11e70c59d2e9cd9218faedef2b2b507f852f
Author: Tor Lillqvist tlillqv...@suse.com
Date:   Fri Jun 8 22:04:48 2012 +0300

Do what the TODO said: Remove unused member and inclusion of vcl/virdev.hxx

Add header back in a few C++ files elsewhere.

Change-Id: I041ed39ff9bb26d1f42f3614ca50dbc085f13861

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index adaeaaa..c033c75 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -34,6 +34,7 @@
 #include vcl/decoview.hxx
 #include vcl/toolbox.hxx
 #include vcl/scrbar.hxx
+#include vcl/virdev.hxx
 
 #include sfx2/app.hxx
 #include sfx2/sfxdlg.hxx
diff --git a/framework/source/services/backingwindow.cxx 
b/framework/source/services/backingwindow.cxx
index 1755b98..019619e 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -40,6 +40,7 @@
 #include vcl/mnemonic.hxx
 #include vcl/menu.hxx
 #include vcl/svapp.hxx
+#include vcl/virdev.hxx
 
 #include tools/urlobj.hxx
 
diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx 
b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
index e3e8700..df7b87b 100644
--- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
+++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx
@@ -28,6 +28,7 @@
 #include tbzoomsliderctrl.hxx
 #include vcl/image.hxx
 #include vcl/toolbox.hxx
+#include vcl/virdev.hxx
 #include vcl/svapp.hxx
 #include vcl/gradient.hxx
 #include svl/itemset.hxx
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index ddc11ed..db68e58 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -60,6 +60,7 @@
 #include svx/svdopath.hxx
 #include svx/dlgutil.hxx
 #include vcl/svapp.hxx
+#include vcl/virdev.hxx
 #include dlgunit.hxx
 
 SFX_IMPL_FLOATINGWINDOW( SvxContourDlgChildWindow, SID_CONTOUR_DLG );
diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx
index 75ff319..8e1270f 100644
--- a/vcl/inc/vcl/toolbox.hxx
+++ b/vcl/inc/vcl/toolbox.hxx
@@ -34,7 +34,6 @@
 #include vcl/dockwin.hxx
 #include vcl/image.hxx
 #include vcl/timer.hxx
-#include vcl/virdev.hxx
 
 class UserDrawEvent;
 
@@ -176,7 +175,6 @@ class VCL_DLLPUBLIC ToolBox : public DockingWindow
 
 private:
 ImplToolBoxPrivateData* mpData;
-VirtualDevice*  mpBtnDev; // TODO: remove unused member
 ImplToolSizeArray*  mpFloatSizeAry;
 XubString   maCvtStr;
 XubString   maNextToolBoxStr;
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 370eb0d..aeb2351 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -39,7 +39,6 @@
 #include vcl/svapp.hxx
 #include vcl/help.hxx
 #include vcl/sound.hxx
-#include vcl/virdev.hxx
 #include vcl/spin.h
 #include vcl/toolbox.hxx
 #include vcl/bitmap.hxx
@@ -1541,7 +1540,6 @@ void ToolBox::ImplInit( Window* pParent, WinBits nStyle )
 
 // initialize variables
 ImplGetWindowImpl()-mbToolBox = sal_True;
-mpBtnDev  = NULL;
 mpFloatSizeAry= NULL;
 mpData= new ImplToolBoxPrivateData;
 mpFloatWin= NULL;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index a7c3d11..e55a092 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -56,6 +56,7 @@
 #include vcl/gdimtf.hxx
 #include vcl/pdfextoutdevdata.hxx
 #include vcl/lazydelete.hxx
+#include vcl/virdev.hxx
 
 // declare system types in sysdata.hxx
 #include svsys.h
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Thorsten Behrens]

 cui/source/tabpages/numpages.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 5601c5d395a5eece95a8d8a5600de91aa20485c6
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] .: cui/source sw/source

[Andras Timar]

 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 f07b7ddb05194be946dc4d8dea39876ce2c2b76b
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

[Libreoffice-commits] .: cui/source

[Andras Timar]

 cui/source/inc/postdlg.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e4d49e65a65b5f4fbe3bb27fa1097e414857d535
Author: Andras Timar ati...@suse.com
Date:   Thu Jun 7 10:27:49 2012 +0200

Hide aAuthorFT fixed text, too, when the button is hidden

Change-Id: If8cd9a9f9e5518d054b9648cde28d996454480c5

diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 7d66cc9..953fbef 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -75,7 +75,7 @@ public:
 
 voidShowLastAuthor(const String rAuthor, const String 
rDate);
 inline void DontChangeAuthor()  { aAuthorBtn.Enable(sal_False); }
-inline void HideAuthor(){ aAuthorBtn.Hide(); }
+inline void HideAuthor(){ aAuthorFT.Hide(); 
aAuthorBtn.Hide(); }
 inline void SetReadonlyPostIt(sal_Bool bDisable)
 {
 aOKBtn.Enable( !bDisable );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Ivan Timofeev]

 cui/source/inc/treeopt.hxx |4 ++--
 cui/source/options/treeopt.cxx |   28 ++--
 cui/source/options/treeopt.hrc |   11 ++-
 cui/source/options/treeopt.src |   19 +--
 4 files changed, 27 insertions(+), 35 deletions(-)

New commits:
commit 0d663b02dc04f06170afdac578fc4f7629be78a0
Author: Ivan Timofeev timofeev@gmail.com
Date:   Thu May 31 21:16:30 2012 +0400

remove the border from the options dialog, use just a separator instead

Change-Id: Ie1ca686a6bc7aea223837ab4c1ec0dad82b43073

diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index aa3af77..38700e6 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -27,7 +27,7 @@
  /
 
 #include tools/resary.hxx
-#include vcl/fixbrd.hxx
+#include vcl/fixed.hxx
 
 class SfxModule;
 class SfxShell;
@@ -155,7 +155,7 @@ private:
 HelpButton  aHelpPB;
 PushButton  aBackPB;
 
-FixedBorder aHiddenGB;
+FixedLine   aSeparatorFL;
 
 SvTreeListBox   aTreeLB;
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index e225df3..809943b 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -501,7 +501,7 @@ struct OptionsGroupInfo
 aCancelPB   ( this, CUI_RES( PB_CANCEL ) ),\
 aHelpPB ( this, CUI_RES( PB_HELP ) ),\
 aBackPB ( this, CUI_RES( PB_BACK ) ),\
-aHiddenGB   ( this, CUI_RES( FB_BORDER ) ),\
+aSeparatorFL( this, CUI_RES( FL_SEPARATOR ) ),\
 aTreeLB ( this, CUI_RES( TLB_PAGES ) ),\
 sTitle  ( GetText() ),\
 sNotLoadedError (   CUI_RES( ST_LOAD_ERROR ) ),\
@@ -785,8 +785,6 @@ void OfaTreeOptionsDialog::InitTreeAndHandler()
 aTreeLB.SetSelectHdl( LINK( this, OfaTreeOptionsDialog, ShowPageHdl_Impl ) 
);
 aBackPB.SetClickHdl( LINK( this, OfaTreeOptionsDialog, BackHdl_Impl ) );
 aOkPB.SetClickHdl( LINK( this, OfaTreeOptionsDialog, OKHdl_Impl ) );
-
-aHiddenGB.Show();
 }
 
 void OfaTreeOptionsDialog::ActivatePage( sal_uInt16 nResId )
@@ -1079,13 +1077,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
 SvtViewOptions aTabPageOpt( E_TABPAGE, String::CreateFromInt32( 
pPageInfo-m_nPageId ) );
 pPageInfo-m_pPage-SetUserData( GetViewOptUserItem( aTabPageOpt ) 
);
 
-Point aTreePos(aTreeLB.GetPosPixel());
-Size aTreeSize(aTreeLB.GetSizePixel());
-Point aGBPos(aHiddenGB.GetPosPixel());
-Size aPageSize(pPageInfo-m_pPage-GetSizePixel());
-Size aGBSize(aHiddenGB.GetSizePixel());
-Point aPagePos( aGBPos.X() + ( aGBSize.Width() - aPageSize.Width() 
) / 2,
-aGBPos.Y() + ( aGBSize.Height() - 
aPageSize.Height() ) / 2 );
+Point aPagePos( aSeparatorFL.GetPosPixel().X(), 
aTreeLB.GetPosPixel().Y());
 pPageInfo-m_pPage-SetPosPixel( aPagePos );
 if ( RID_SVXPAGE_COLOR == pPageInfo-m_nPageId )
 {
@@ -,12 +1103,12 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
 
 pPageInfo-m_pExtPage = new ExtensionsTabPage(
 this, 0, pPageInfo-m_sPageURL, pPageInfo-m_sEventHdl, 
m_xContainerWinProvider );
-Size aSize = aHiddenGB.GetSizePixel();
-aSize.Width() = aSize.Width() - 4;
-aSize.Height() = aSize.Height() - 4;
-Point aPos = aHiddenGB.GetPosPixel();
-aPos.X() = aPos.X() + 2;
-aPos.Y() = aPos.Y() + 2;
+Size aSize;
+aSize.Width() = aSeparatorFL.GetSizePixel().Width();
+aSize.Height() = aSeparatorFL.GetSizePixel().Height() - 
aTreeLB.GetPosPixel().Y();
+Point aPos;
+aPos.X() = aSeparatorFL.GetPosPixel().X();
+aPos.Y() = aTreeLB.GetPosPixel().Y();
 pPageInfo-m_pExtPage-SetPosSizePixel( aPos, aSize );
 }
 
@@ -1928,7 +1920,7 @@ namespace
 
 void OfaTreeOptionsDialog::ResizeTreeLB( void )
 {
-const long  nMax = aHiddenGB.GetSizePixel().Width() * 42 / 100;
+const long  nMax = aSeparatorFL.GetSizePixel().Width() * 42 / 100;
 // don't ask where 42 comes 
from... but it looks / feels ok ;-)
 longnDelta = 50;// min.
 sal_uInt16  nDepth = 0;
@@ -1971,7 +1963,7 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void )
 MoveControl( aCancelPB, nDelta );
 MoveControl( aHelpPB, nDelta );
 MoveControl( aBackPB, nDelta );
-MoveControl( aHiddenGB, nDelta );
+MoveControl( aSeparatorFL, nDelta );
 }
 
 bool isNodeActive( OptionsNode* pNode, Module* pModule )
diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc
index fc4e55f..3be1d6a 100644
--- a/cui/source/options/treeopt.hrc
+++ b/cui/source/options/treeopt.hrc
@@ -35,7 +35,7 @@
 #define PB_BACK 4
 #define TLB_PAGES   5
 
-#define 

[Libreoffice-commits] .: cui/source

[Ivan Timofeev]

 cui/source/options/treeopt.cxx |   10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

New commits:
commit b45aa8d59351e78660ef504e0c8433c5011e6e09
Author: Ivan Timofeev timofeev@gmail.com
Date:   Mon Jun 4 11:28:49 2012 +0400

scatterbrain forgot to amend the previous commit

Change-Id: Id26bb075d02be3d6ddfd457afd36c5d1114122e4

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 809943b..95a52c6 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1103,12 +1103,10 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
 
 pPageInfo-m_pExtPage = new ExtensionsTabPage(
 this, 0, pPageInfo-m_sPageURL, pPageInfo-m_sEventHdl, 
m_xContainerWinProvider );
-Size aSize;
-aSize.Width() = aSeparatorFL.GetSizePixel().Width();
-aSize.Height() = aSeparatorFL.GetSizePixel().Height() - 
aTreeLB.GetPosPixel().Y();
-Point aPos;
-aPos.X() = aSeparatorFL.GetPosPixel().X();
-aPos.Y() = aTreeLB.GetPosPixel().Y();
+
+Point aPos(aSeparatorFL.GetPosPixel().X(), aTreeLB.GetPosPixel().Y());
+Size aSize(aSeparatorFL.GetSizePixel().Width(),
+   aSeparatorFL.GetPosPixel().Y() - aTreeLB.GetPosPixel().Y());
 pPageInfo-m_pExtPage-SetPosSizePixel( aPos, aSize );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Ivan Timofeev]

 cui/source/options/optsave.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 39205cb3ab21418f715a4e8c0628dec859a577c9
Author: Ivan Timofeev timofeev@gmail.com
Date:   Tue Jun 5 08:43:09 2012 +0400

Revert Dupe code removal in cui

FI is an image, FT is a text...

This reverts commit ecdd0501c809e8f283a09cc320a539b828bfec2f.

diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index efae17b..6abeaed 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -657,6 +657,7 @@ IMPL_LINK_NOARG(SfxSaveTabPage, ODFVersionHdl_Impl)
 }
 
 aODFWarningFI.Show( bShown );
+aODFWarningFT.Show( bShown );
 
 return 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Thorsten Behrens]

 cui/source/inc/textattr.hxx |   19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 80e27498a76356b703413fcb4cfa560510e7dc25
Author: Thorsten Behrens tbehr...@suse.com
Date:   Fri Jun 1 14:54:39 2012 +0200

Revert cleanup obsolete comments

This reverts commit 04df950dcc432834bbc2d3a27e13a7817eb775d5.

diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index ced0825..100fc52 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -95,6 +95,7 @@ private:
 bool IsTextDirectionLeftToRight (void) const;
 
 public:
+
 SvxTextAttrPage( Window* pWindow, const SfxItemSet rInAttrs );
 ~SvxTextAttrPage();
 
@@ -108,9 +109,25 @@ public:
 
 void Construct();
 void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
-virtual void PageCreated(SfxAllItemSet aSet);
+virtual voidPageCreated(SfxAllItemSet aSet); // add CHINA001
 };
 
+/*
+|*
+|* Von SfxSingleTabDialog abgeleitet, um vom Control uber virtuelle Methode
+|* benachrichtigt werden zu konnen.
+|*
+\/
+
+//CHINA001 class SvxTextAttrDialog : public SfxSingleTabDialog
+//CHINA001 {
+//CHINA001 public:
+//CHINA001 SvxTextAttrDialog( Window* pParent, const SfxItemSet rAttr,
+//CHINA001 const SdrView* pView );
+//CHINA001 ~SvxTextAttrDialog();
+//CHINA001 };
+
+
 #endif // _SVX_TEXTATTR_HXX
 
 /* 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] .: cui/source

[Kohei Yoshida]

 cui/source/options/connpooloptions.src |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a9b70021724fa918f61d6e11ae72a19b02eb5e6b
Author: Kohei Yoshida kohei.yosh...@gmail.com
Date:   Wed May 30 13:31:20 2012 -0400

Use TP_WIDTH  TP_HEIGHT for the Connection options page.

Change-Id: I1142b691bc964e3fb12d25ca885dbc5c09cb85c7

diff --git a/cui/source/options/connpooloptions.src 
b/cui/source/options/connpooloptions.src
index 89b4559..31d9adc 100644
--- a/cui/source/options/connpooloptions.src
+++ b/cui/source/options/connpooloptions.src
@@ -28,8 +28,8 @@
 #include connpooloptions.hrc
 #include cuires.hrc
 
-#define PAGE_SIZE_X 260
-#define PAGE_SIZE_Y 185
+#define PAGE_SIZE_X TP_WIDTH
+#define PAGE_SIZE_Y TP_HEIGHT
 
 #define LIST_SIZE_Y 100
 
@@ -37,6 +37,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS
 {
 HelpID = cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS;
 OutputSize = TRUE ;
+Pos = MAP_APPFONT ( 0 , 0 ) ;
 Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ;
 SVLook = TRUE ;
 Hide = TRUE ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[David Tardon]

 cui/source/options/treeopt.hrc |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit eb0a1da770161a7d680061eaa3d79f8ea8eef6ac
Author: David Tardon dtar...@redhat.com
Date:   Fri May 25 10:50:54 2012 +0200

resize options dialog to fit to increased tab height

Change-Id: I6255eba78aa4e012e6d29b7faed5f3bbc5302d25

diff --git a/cui/source/options/treeopt.hrc b/cui/source/options/treeopt.hrc
index 46572f4..fc4e55f 100644
--- a/cui/source/options/treeopt.hrc
+++ b/cui/source/options/treeopt.hrc
@@ -25,6 +25,8 @@
  *
  /
 
+#include sfx2/tabpage.hrc
+
 #include svtools/controldims.hrc
 
 #define PB_OK   1
@@ -55,8 +57,8 @@
 
 // metrics
 
-#define WIDTH_PAGEFRAME 263
-#define HEIGHT_PAGEFRAME191
+#define WIDTH_PAGEFRAME (TP_WIDTH + 3)
+#define HEIGHT_PAGEFRAME(TP_HEIGHT + 6)
 
 #define COL_1   (RSC_SP_DLG_INNERBORDER_LEFT)
 #define COL_2   (COL_1+0)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Caolán McNamara]

 cui/source/dialogs/SpellDialog.cxx |4 ++--
 cui/source/inc/SpellDialog.hxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e5d589bb3c2285362e2c89576cf14fc5e77262d0
Author: Caolán McNamara caol...@redhat.com
Date:   Tue May 22 16:10:22 2012 +0100

Resolves: fdo#40778 wrong type used for callback arg

Change-Id: If97589c7b7ad647b22de229a6161b4fd78c757c8

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 64df45d..602289e 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1017,9 +1017,9 @@ int SpellDialog::InitUserDicts()
 }
 
 //---
-IMPL_LINK(SpellDialog, AddToDictClickHdl, MenuButton*, pButton )
+IMPL_LINK(SpellDialog, AddToDictClickHdl, PushButton*, EMPTYARG )
 {
-return AddToDictionaryExecute(1, pButton-GetPopupMenu());
+return AddToDictionaryExecute(1, aAddToDictMB.GetPopupMenu());
 }
 
 //---
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 1343b04..fc6448e 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -214,7 +214,7 @@ private:
 DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *);
 DECL_LINK(UndoHdl, void *);
 DECL_LINK( AddToDictSelectHdl, MenuButton* );
-DECL_LINK( AddToDictClickHdl, MenuButton* );
+DECL_LINK( AddToDictClickHdl, PushButton* );
 DECL_LINK( LanguageSelectHdl, SvxLanguageBox* );
 DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
 DECL_LINK( HandleHyperlink, svt::FixedHyperlink * );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Caolán McNamara]

 cui/source/dialogs/SpellDialog.cxx |   25 -
 cui/source/dialogs/SpellDialog.hrc |1 +
 cui/source/dialogs/SpellDialog.src |   10 ++
 cui/source/inc/SpellDialog.hxx |3 ++-
 4 files changed, 33 insertions(+), 6 deletions(-)

New commits:
commit fdec471a7caca3b5065676e3f31aeaa91b0f238f
Author: Caolán McNamara caol...@redhat.com
Date:   Thu May 17 14:14:58 2012 +0100

Related: fdo#40778 use simple pushbutton for add to single user dict

for add an unknown word to user-defined dictionaries
a) use a normal button when there's only one user-defined dictionary
b) use a dropdown when there's more than one user-defined dictionary

Change-Id: I8a8eb3fff6c4582341d8322df403b73a517a5560

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 200cd39..64df45d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -235,6 +235,7 @@ SpellDialog::SpellDialog(
 aIgnoreAllPB( this, CUI_RES( PB_IGNOREALL ) ),
 aIgnoreRulePB   ( this, CUI_RES( PB_IGNORERULE ) ),
 aAddToDictMB( this, CUI_RES( MB_ADDTODICT ) ),
+aAddToDictPB( this, CUI_RES( PB_ADDTODICT ) ),
 
 aChangePB   ( this, CUI_RES( PB_CHANGE ) ),
 aChangeAllPB( this, CUI_RES( PB_CHANGEALL ) ),
@@ -324,9 +325,9 @@ void SpellDialog::Init_Impl()
 
 aSentenceED.SetModifyHdl(LINK ( this, SpellDialog, ModifyHdl) );
 
-aAddToDictMB.SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
 aAddToDictMB.SetSelectHdl(LINK ( this, SpellDialog, AddToDictSelectHdl ) );
-aAddToDictMB.SetClickHdl(LINK ( this, SpellDialog, AddToDictClickHdl ) );
+aAddToDictPB.SetClickHdl(LINK ( this, SpellDialog, AddToDictClickHdl ) );
+
 aLanguageLB.SetSelectHdl(LINK( this, SpellDialog, LanguageSelectHdl ) );
 
 aExplainLink.SetClickHdl( LINK( this, SpellDialog, HandleHyperlink ) );
@@ -368,7 +369,7 @@ void SpellDialog::UpdateBoxes_Impl()
 else
 SetTitle_Impl( nAltLanguage );
 SetSelectedLang_Impl( nAltLanguage );
-InitUserDicts();
+int nDicts = InitUserDicts();
 
 // enter alternatives
 const ::rtl::OUString *pNewWords = aNewWords.getConstArray();
@@ -399,7 +400,9 @@ void SpellDialog::UpdateBoxes_Impl()
 aExplainFT.Show( !bShowChangeAll );
 aLanguageLB.Enable( bShowChangeAll );
 aIgnoreAllPB.Show( bShowChangeAll );
-aAddToDictMB.Show( bShowChangeAll );
+
+aAddToDictMB.Show( bShowChangeAll  nDicts  1);
+aAddToDictPB.Show( bShowChangeAll  nDicts = 1);
 aIgnoreRulePB.Show( !bShowChangeAll );
 aIgnoreRulePB.Enable(pSpellErrorDescription  
!pSpellErrorDescription-sRuleId.isEmpty());
 aAutoCorrPB.Show( bShowChangeAll  rParent.HasAutoCorrection() );
@@ -465,6 +468,7 @@ void SpellDialog::UpdateBoxes_Impl()
 aIgnoreAllPB,
 aIgnoreRulePB,
 aAddToDictMB,
+aAddToDictPB,
 aChangePB,
 aChangeAllPB,
 aAutoCorrPB,
@@ -939,7 +943,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang)
 SetText( sTitle );
 }
 
-void SpellDialog::InitUserDicts()
+int SpellDialog::InitUserDicts()
 {
 const LanguageType nLang = aLanguageLB.GetSelectLanguage();
 
@@ -1002,6 +1006,14 @@ void SpellDialog::InitUserDicts()
 }
 aAddToDictMB.SetPopupMenu(pMenu);
 aAddToDictMB.Enable( bEnable );
+aAddToDictPB.Enable( bEnable );
+
+int nDicts = nItemId-1;
+
+aAddToDictMB.Show( nDicts  1 );
+aAddToDictPB.Show( nDicts = 1 );
+
+return nDicts;
 }
 
 //---
@@ -1154,6 +1166,7 @@ void SpellDialog::InvalidateDialog()
 aIgnoreAllPB,
 aIgnoreRulePB,
 aAddToDictMB,
+aAddToDictPB,
 aChangePB,
 aChangeAllPB,
 aAutoCorrPB,
@@ -1753,6 +1766,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool 
bIgnoreCurrentError )
 pSpellDialog-aIgnoreAllPB.Enable(bRet);
 pSpellDialog-aAutoCorrPB.Enable(bRet);
 pSpellDialog-aAddToDictMB.Enable(bRet);
+pSpellDialog-aAddToDictPB.Enable(bRet);
 return bRet;
 }
 
@@ -2118,6 +2132,7 @@ void  SentenceEditWindow_Impl::SetUndoEditMode(bool bSet)
 pSpellDialog-aLanguageFT,
 pSpellDialog-aLanguageLB,
 pSpellDialog-aAddToDictMB,
+pSpellDialog-aAddToDictPB,
 pSpellDialog-aAutoCorrPB,
 0
 };
diff --git a/cui/source/dialogs/SpellDialog.hrc 
b/cui/source/dialogs/SpellDialog.hrc
index 36b6c56..ac03c24 100644
--- a/cui/source/dialogs/SpellDialog.hrc
+++ b/cui/source/dialogs/SpellDialog.hrc
@@ -51,3 +51,4 @@
 #define LINK_EXPLAIN  55
 #define FT_EXPLAIN  56
 #define PB_IGNORERULE   59
+#define PB_ADDTODICT60
diff --git a/cui/source/dialogs/SpellDialog.src 
b/cui/source/dialogs/SpellDialog.src
index 4a5b2c9..9781ae1 100644
--- 

[Libreoffice-commits] .: cui/source

[Ivan Timofeev]

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

New commits:
commit 4979a3cfd43b9f79005bf76da9e2dbdffc9e91f5
Author: Ivan Timofeev timofeev@gmail.com
Date:   Tue May 8 17:40:28 2012 +0400

Revert fdo#49421: the Available language modules list is too small and 
...

which is no longer relevant since 6a64e5bbd43e262d87e291dcc411628efac61fde

This reverts commit 31182ed08494ed6afa3371aa246b155c6b58e8b3.

Change-Id: Idbcd6b2e21b1e0e93b167c78ff361c81cf25c978

diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index b52de08..1187295 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -219,7 +219,7 @@ TabPage RID_SFXPAGE_LINGU
 Control CLB_LINGU_MODULES
 {
 Pos = MAP_APPFONT ( 12 , 25 ) ;
-Size = MAP_APPFONT ( 182 , 34 ) ;
+Size = MAP_APPFONT ( 182 , 30 ) ;
 Border = TRUE ;
 TabStop = TRUE ;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Ivan Timofeev]

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

New commits:
commit 31182ed08494ed6afa3371aa246b155c6b58e8b3
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sun May 6 22:16:59 2012 +0400

fdo#49421: the Available language modules list is too small and unusable

Change-Id: Ie1b68176765dec49307fb8928738073052188ccf

diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index 1187295..b52de08 100644
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -219,7 +219,7 @@ TabPage RID_SFXPAGE_LINGU
 Control CLB_LINGU_MODULES
 {
 Pos = MAP_APPFONT ( 12 , 25 ) ;
-Size = MAP_APPFONT ( 182 , 30 ) ;
+Size = MAP_APPFONT ( 182 , 34 ) ;
 Border = TRUE ;
 TabStop = TRUE ;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Caolán McNamara]

 cui/source/tabpages/autocdlg.src |  117 ---
 1 file changed, 25 insertions(+), 92 deletions(-)

New commits:
commit 8da9221b02429558bd61168b8f00b16ef714a34c
Author: Caolán McNamara caol...@redhat.com
Date:   Wed May 2 13:43:08 2012 +0100

accessibility resources in the wrong dialog definition

Change-Id: Ib3fe9b6a5b0a26343142044be5e638be46276f27

diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index 74090a0..67dd19b 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -496,30 +496,6 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
 {
 Text [ en-US ] = Delete words with two initial capitals ;
 };
-String STR_PB_SGL_STD
-{
-Text [ en-US ] = Single quotes default ;
-};
-String STR_PB_DBL_STD
-{
-Text [ en-US ] = Double quotes default ;
-};
-String STR_PB_SGL_START
-{
-Text [ en-US ] = Start quote of single quotes ;
-};
-String STR_PB_DBL_START
-{
-Text [ en-US ] = Start quote of double quotes ;
-};
-String STR_PB_SGL_END
-{
-Text [ en-US ] = End quote of single quotes ;
-};
-String STR_PB_DBL_END
-{
-Text [ en-US ] = End quote of double quotes ;
-};
 };
 /**/
 /**/
@@ -565,7 +541,7 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
 };
 CheckBox CB_SGL_TYPO
 {
-HelpId = cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO;
+HelpId = cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO;
 Pos = MAP_APPFONT ( 7 , 101 ) ;
 Size = MAP_APPFONT ( 86 , 10 ) ;
 Text [ en-US ] = Repla~ce ;
@@ -688,6 +664,30 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE
 {
 Text [ en-US ] = Default ;
 };
+String STR_PB_SGL_STD
+{
+Text [ en-US ] = Single quotes default ;
+};
+String STR_PB_DBL_STD
+{
+Text [ en-US ] = Double quotes default ;
+};
+String STR_PB_SGL_START
+{
+Text [ en-US ] = Start quote of single quotes ;
+};
+String STR_PB_DBL_START
+{
+Text [ en-US ] = Start quote of double quotes ;
+};
+String STR_PB_SGL_END
+{
+Text [ en-US ] = End quote of single quotes ;
+};
+String STR_PB_DBL_END
+{
+Text [ en-US ] = End quote of double quotes ;
+};
 };
 
 /**/
@@ -869,70 +869,3 @@ TabPage RID_OFAPAGE_SMARTTAG_OPTIONS
 };
 
 };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Caolán McNamara]

 cui/source/options/optinet2.hrc |4 ++--
 cui/source/options/optinet2.src |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 6b0280acb864fc74a20e067e97363b4159e542e1
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Apr 26 12:39:30 2012 +0100

adjust rows so options and macro security frames are laid out the same

diff --git a/cui/source/options/optinet2.hrc b/cui/source/options/optinet2.hrc
index 34dce4f..d39495f 100644
--- a/cui/source/options/optinet2.hrc
+++ b/cui/source/options/optinet2.hrc
@@ -116,9 +116,9 @@
 #define ROW_4a  (ROW_4+RSC_CD_CHECKBOX_HEIGHT+1)
 #define ROW_5   
(ROW_4a+4*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
 #define ROW_6   
(ROW_5+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_7   
(ROW_6+2*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_DESC_Y)
+#define ROW_7   
(ROW_6+3*RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
+#define ROW_7a  
(ROW_7-RSC_SP_FLGR_SPACE_Y-RSC_CD_PUSHBUTTON_HEIGHT)
 #define ROW_8   
(ROW_7+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
-#define ROW_9   
(ROW_8+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_DESC_Y)
 
 // Defines - JavaScriptDisableQueryBox_Impl ---
 
diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src
index 9ac8dc1..353eded 100644
--- a/cui/source/options/optinet2.src
+++ b/cui/source/options/optinet2.src
@@ -367,7 +367,7 @@ TabPage RID_SVXPAGE_INET_SECURITY
 PushButton PB_SEC_MACROSEC
 {
 HelpID = cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC;
-Pos = MAP_APPFONT( COL_3, ROW_6-2 );
+Pos = MAP_APPFONT( COL_3, ROW_7a );
 Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT 
);
 Text [ en-US ] = Macro Security...;
 };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Takeshi Abe]

 cui/source/inc/about.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 52d90ce040234cb35fad03bdd12e201bfa3a8634
Author: Takeshi Abe t...@fixedpoint.jp
Date:   Wed Apr 25 01:29:20 2012 +0900

removed unused typedef

diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index 2a81c37..a665215 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -38,8 +38,6 @@
 #include sfx2/basedlgs.hxx// SfxModalDialog
 #include vector
 
-typedef ::std::vector Accelerator*  AccelList;
-
 // class AboutDialog -
 
 class AboutDialog : public SfxModalDialog
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source i18nutil/inc i18nutil/source sd/inc sd/source vcl/source

[Ivan Timofeev]

 cui/source/tabpages/page.cxx  |4 ++--
 cui/source/tabpages/page.h|3 ++-
 cui/source/tabpages/page.src  |3 ++-
 i18nutil/inc/i18nutil/paper.hxx   |7 ---
 i18nutil/source/utility/paper.cxx |6 --
 sd/inc/sdenumdef.hxx  |2 +-
 sd/source/core/drawdoc2.cxx   |2 +-
 sd/source/ui/app/sdmod1.cxx   |   10 ++
 sd/source/ui/dlg/dlgass.cxx   |6 ++
 sd/source/ui/dlg/dlgass.src   |   10 ++
 sd/source/ui/inc/dlgass.hrc   |1 +
 vcl/source/gdi/print.cxx  |2 +-
 vcl/source/src/print.src  |1 -
 13 files changed, 44 insertions(+), 13 deletions(-)

New commits:
commit 9c99dac0968c405537cd6094a46c7f6de01ccc4e
Author: Rob Snelders programm...@ertai.nl
Date:   Wed Apr 18 23:30:26 2012 +0200

fdo#42986 Add Presentationsize 16:9 Widescreen

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index efa495b..417b311 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -989,7 +989,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox 
*, pBox )
 {
 // Draw: if paper format the margin shall be 1 cm
 long nTmp = 0;
-sal_Bool bScreen = ( PAPER_SCREEN == ePaper );
+sal_Bool bScreen = (( PAPER_SCREEN_4_3 == ePaper )|| ( 
PAPER_SCREEN_16_9 == ePaper));
 
 if ( !bScreen )
 // no margin if screen
@@ -1400,7 +1400,7 @@ int SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet )
 sal_uInt16 nPos = aPaperSizeBox.GetSelectEntryPos();
 Paper ePaper = (Paper)(sal_uLong)aPaperSizeBox.GetEntryData( nPos );
 
-if ( ePaper != PAPER_SCREEN  IsMarginOutOfRange() )
+if ( ePaper != PAPER_SCREEN_4_3  ePaper != PAPER_SCREEN_16_9  
IsMarginOutOfRange() )
 {
 if ( QueryBox( this, WB_YES_NO | WB_DEF_NO, aPrintRangeQueryText 
).Execute() == RET_NO )
 {
diff --git a/cui/source/tabpages/page.h b/cui/source/tabpages/page.h
index bc7ad78..87858fe 100644
--- a/cui/source/tabpages/page.h
+++ b/cui/source/tabpages/page.h
@@ -54,7 +54,7 @@
 #define PAPERSIZE_C65   16
 #define PAPERSIZE_DL17
 #define PAPERSIZE_DIA   18
-#define PAPERSIZE_SCREEN19
+#define PAPERSIZE_SCREEN_4_319
 #define PAPERSIZE_C 20
 #define PAPERSIZE_D 21
 #define PAPERSIZE_E 22
@@ -74,6 +74,7 @@
 #define PAPERSIZE_B6_JIS36
 #define PAPERSIZE_POSTCARD_JP   46
 #define PAPERSIZE_A656
+#define PAPERSIZE_SCREEN_16_9   78
 
 #endif
 
diff --git a/cui/source/tabpages/page.src b/cui/source/tabpages/page.src
index 91873c7..2137ff2 100644
--- a/cui/source/tabpages/page.src
+++ b/cui/source/tabpages/page.src
@@ -452,7 +452,8 @@ StringArray RID_SVXSTRARY_PAPERSIZE_DRAW
  C5 Envelope ; PAPERSIZE_C5 ;  ;
  C4 Envelope ; PAPERSIZE_C4 ;  ;
  Dia Slide ; PAPERSIZE_DIA ;  ;
- Screen ; PAPERSIZE_SCREEN ;  ;
+ Screen 4:3 ; PAPERSIZE_SCREEN_4_3 ;  ;
+ Screen 16:9 ; PAPERSIZE_SCREEN_16_9 ;  ;
  Japanese Postcard ; PAPERSIZE_POSTCARD_JP;  ;
 };
 };
diff --git a/i18nutil/inc/i18nutil/paper.hxx b/i18nutil/inc/i18nutil/paper.hxx
index d5be9ec..98b88bd 100644
--- a/i18nutil/inc/i18nutil/paper.hxx
+++ b/i18nutil/inc/i18nutil/paper.hxx
@@ -58,7 +58,7 @@ enum Paper
 PAPER_ENV_C65,
 PAPER_ENV_DL,
 PAPER_SLIDE_DIA,
-PAPER_SCREEN,
+PAPER_SCREEN_4_3,
 PAPER_C,
 PAPER_D,
 PAPER_E,
@@ -116,11 +116,12 @@ enum Paper
 PAPER_ARCHB,
 PAPER_ARCHC,
 PAPER_ARCHD,
-PAPER_ARCHE
+PAPER_ARCHE,
+PAPER_SCREEN_16_9
 };
 
 // defined for 'equal size' test with the implementation array
-#define NUM_PAPER_ENTRIES   (PAPER_ARCHE - PAPER_A0 + 1)
+#define NUM_PAPER_ENTRIES   (PAPER_SCREEN_16_9 - PAPER_A0 + 1)
 
 // -
 // - Paper -
diff --git a/i18nutil/source/utility/paper.cxx 
b/i18nutil/source/utility/paper.cxx
index 63b5cff..a79089d 100644
--- a/i18nutil/source/utility/paper.cxx
+++ b/i18nutil/source/utility/paper.cxx
@@ -93,7 +93,7 @@ static PageDesc aDinTab[] =
 { MM2MM100( 114 ),   MM2MM100( 229 ),EnvC65, NULL },
 { MM2MM100( 110 ),   MM2MM100( 220 ),EnvDL,  DL },
 { MM2MM100( 180),MM2MM100( 270 ),NULL,  NULL }, //Dia
-{ MM2MM100( 210),MM2MM100( 280 ),NULL,  NULL }, //Screen
+{ MM2MM100( 210),MM2MM100( 280 ),NULL,  NULL }, //Screen 4:3
 { IN2MM100( 17 ),IN2MM100( 22 ), AnsiC,  CSheet },
 { IN2MM100( 22 ),IN2MM100( 34 ), AnsiD,  DSheet },
 { IN2MM100( 34 ),IN2MM100( 44 ), AnsiE,  ESheet },
@@ -155,7 +155,9 @@ static PageDesc aDinTab[] =
 { IN2MM100( 12 ),IN2MM100( 18 ), ARCHB,  NULL },
 { IN2MM100( 18 ),IN2MM100( 24 ), ARCHC,  NULL },
 { IN2MM100( 24 ),IN2MM100( 36 ), ARCHD,  NULL },
-{ IN2MM100( 36 ),IN2MM100( 48 ), ARCHE,  NULL }
+{ IN2MM100( 36 ),IN2MM100( 48 ), ARCHE,  NULL },

[Libreoffice-commits] .: cui/source

[Miklos Vajna]

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

New commits:
commit 29042d096a2c5812ae179e1553367afd21b0f71e
Author: Miklos Vajna vmik...@suse.cz
Date:   Sat Apr 21 14:26:49 2012 +0200

cui: fix position of ED_LINEDISTMETRIC

I broke that when I added CB_CONTEXTUALSPACING

diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index d6de18e..e064ac7 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -235,7 +235,7 @@ TabPage RID_SVXPAGE_STD_PARAGRAPH
 Disable = TRUE ;
 Border = TRUE ;
 Hide = TRUE ;
-Pos = MAP_APPFONT ( 135 , 133 ) ;
+Pos = MAP_APPFONT ( 135 , 147 ) ;
 Size = MAP_APPFONT ( 40 , 12 ) ;
 Group = TRUE ;
 Left = TRUE ;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source dbaccess/source fpicker/source framework/inc framework/source scripting/source sfx2/inc svl/source svtools/inc svtools/source svx/source unotools/source

[Thomas Arnhold]

 cui/source/inc/acccfg.hxx  |6 -
 cui/source/inc/cfgutil.hxx |4 ---
 dbaccess/source/ui/control/sqledit.cxx |6 -
 fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx |8 
---
 fpicker/source/win32/filepicker/VistaFilePicker.hxx|8 
---
 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx|8 
---
 fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx|8 
---
 fpicker/source/win32/filepicker/asyncrequests.hxx  |8 
---
 fpicker/source/win32/filepicker/vistatypes.h   |8 
---
 framework/inc/framework/preventduplicateinteraction.hxx|   10 
+
 framework/inc/framework/titlehelper.hxx|   10 
+
 framework/source/inc/accelerators/storageholder.hxx|   10 
+
 framework/source/uielement/statusbarmanager.cxx|4 ---
 scripting/source/inc/util/MiscUtils.hxx|4 +--
 scripting/source/protocolhandler/scripthandler.cxx |3 --
 scripting/source/provider/ActiveMSPList.hxx|4 +--
 scripting/source/provider/BrowseNodeFactoryImpl.hxx|4 +--
 scripting/source/provider/MasterScriptProvider.hxx |4 +--
 scripting/source/provider/MasterScriptProviderFactory.hxx  |4 +--
 scripting/source/provider/ProviderCache.hxx|4 +--
 scripting/source/provider/ScriptImpl.hxx   |5 +---
 scripting/source/provider/ScriptingContext.hxx |5 ++--
 scripting/source/provider/URIHelper.hxx|4 +--
 scripting/source/runtimemgr/ScriptNameResolverImpl.hxx |4 +--
 scripting/source/runtimemgr/ScriptRuntimeManager.hxx   |4 +--
 scripting/source/runtimemgr/StorageBridge.hxx  |4 +--
 scripting/source/runtimemgr/StorageBridgeFactory.hxx   |4 +--
 sfx2/inc/sfx2/sfxbasemodel.hxx |9 
+---
 svl/source/config/itemholder2.hxx  |   11 
--
 svtools/inc/svtools/acceleratorexecute.hxx |8 
---
 svtools/source/config/itemholder2.hxx  |   10 
-
 svx/source/inc/docrecovery.hxx |   10 
+
 unotools/source/config/itemholder1.hxx |6 -
 unotools/source/i18n/instance.hxx  |3 --
 34 files changed, 53 insertions(+), 159 deletions(-)

New commits:
commit 2abba84aa7c639011956721a4922653130dd09a6
Author: Thomas Arnhold tho...@arnhold.org
Date:   Sat Apr 21 01:30:38 2012 +0200

Replace css macro with namespace for nicer namespacing

diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index ec03c4a..1cfdc81 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -56,7 +56,7 @@
 #include sfx2/minarray.hxx
 #include cfgutil.hxx
 
-#define css ::com::sun::star
+namespace css = ::com::sun::star;
 
 class SfxMacroInfoItem;
 class SfxConfigGroupListBox_Impl;
@@ -219,10 +219,6 @@ public:
 virtual ~SvxShortcutAssignDlg();
 };
 
-
-
-#undef css
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 94c764b..4e0fd27 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -51,7 +51,7 @@ class SfxMacroInfoItem;
 struct SfxStyleInfo_Impl;
 struct SfxStylesInfo_Impl;
 
-#define css ::com::sun::star
+namespace css = ::com::sun::star;
 
 struct SfxStyleInfo_Impl
 {
@@ -203,8 +203,6 @@ public:
 voidSetStylesInfo(SfxStylesInfo_Impl* pStyles);
 };
 
-#undef css
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/control/sqledit.cxx 
b/dbaccess/source/ui/control/sqledit.cxx
index 765d6a7..3161879 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -45,11 +45,7 @@
 
 #include svl/smplhint.hxx
 
-namespace {
-
-namespace css = com::sun::star;
-
-}
+namespace css = ::com::sun::star;
 
 //
 // OSqlEdit
diff --git a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx 
b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
index 47909d7..ca1b223 100644
--- a/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
+++ b/fpicker/source/win32/filepicker/IVistaFilePickerInternalNotify.hxx
@@ -45,11 +45,7 @@
 // namespace
 //-
 
-#ifdef css
-#error 

[Libreoffice-commits] .: cui/source

[Miklos Vajna]

 cui/source/dialogs/SpellDialog.cxx |   21 +
 cui/source/inc/SpellDialog.hxx |4 +++-
 2 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit 808be9732e409789f9d26c13c15bbd899c408cd0
Author: Rob Snelders r...@ertai.nl
Date:   Sat Apr 14 13:17:04 2012 +0200

fdo#40778 Remove dictionary choice when adding new entry to the spellchecker

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 04f8185..fe1e39d 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -324,7 +324,10 @@ void SpellDialog::Init_Impl()
 aSuggestionLB.SetDoubleClickHdl( LINK( this, SpellDialog, ChangeHdl ) );
 
 aSentenceED.SetModifyHdl(LINK ( this, SpellDialog, ModifyHdl) );
-aAddToDictMB.SetSelectHdl(LINK ( this, SpellDialog, AddToDictionaryHdl ) );
+
+aAddToDictMB.SetMenuMode( MENUBUTTON_MENUMODE_TIMED );
+aAddToDictMB.SetSelectHdl(LINK ( this, SpellDialog, AddToDictSelectHdl ) );
+aAddToDictMB.SetClickHdl(LINK ( this, SpellDialog, AddToDictClickHdl ) );
 aLanguageLB.SetSelectHdl(LINK( this, SpellDialog, LanguageSelectHdl ) );
 
 aExplainLink.SetClickHdl( LINK( this, SpellDialog, HandleHyperlink ) );
@@ -1003,7 +1006,19 @@ void SpellDialog::InitUserDicts()
 }
 
 //---
-IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
+IMPL_LINK(SpellDialog, AddToDictClickHdl, MenuButton*, pButton )
+{
+return AddToDictionaryExecute(1, pButton-GetPopupMenu());
+}
+
+//---
+IMPL_LINK(SpellDialog, AddToDictSelectHdl, MenuButton*, pButton )
+{
+return AddToDictionaryExecute(pButton-GetCurItemId(), 
pButton-GetPopupMenu());
+}
+
+//---
+int SpellDialog::AddToDictionaryExecute( sal_uInt16 nItemId, PopupMenu *pMenu )
 {
 aSentenceED.UndoActionStart( SPELLUNDO_CHANGE_GROUP );
 
@@ -1011,8 +1026,6 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, 
pButton )
 //manually changed
 const String aNewWord= aSentenceED.GetErrorText();
 
-sal_uInt16 nItemId = pButton-GetCurItemId();
-PopupMenu *pMenu = pButton-GetPopupMenu();
 String aDicName ( pMenu-GetItemText( nItemId ) );
 
 uno::Reference linguistic2::XDictionary   xDic;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 2d9383b..f302e1f 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -212,13 +212,15 @@ private:
 DECL_LINK(CancelHdl, void *);
 DECL_LINK( ModifyHdl, SentenceEditWindow_Impl *);
 DECL_LINK(UndoHdl, void *);
-DECL_LINK( AddToDictionaryHdl, MenuButton* );
+DECL_LINK( AddToDictSelectHdl, MenuButton* );
+DECL_LINK( AddToDictClickHdl, MenuButton* );
 DECL_LINK( LanguageSelectHdl, SvxLanguageBox* );
 DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* );
 DECL_LINK( HandleHyperlink, svt::FixedHyperlink * );
 
 DECL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog * );
 
+int AddToDictionaryExecute( sal_uInt16 ItemId, PopupMenu 
*pMenu );
 voidStartSpellOptDlg_Impl();
 voidInitUserDicts();
 voidUpdateBoxes_Impl();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Caolán McNamara]

 cui/source/dialogs/about.cxx |4 ++--
 cui/source/dialogs/about.hrc |   36 ++--
 cui/source/dialogs/about.src |4 ++--
 3 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit f73d26889692599aadaba28db406f430b9af7d8c
Author: Andrew Higginson at.higginsonAtgmail.com
Date:   Mon Apr 16 16:33:41 2012 +0100

Resolves: fdo#48659 about dialog misses BuildID

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index a4352e1..0703f65 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -368,10 +368,10 @@ rtl::OUString AboutDialog::GetVersionString()
 
 rtl::OUString sBuildId = GetBuildId();
 
-if (!sBuildId.isEmpty())
+if (!(sBuildId.trim()).isEmpty())
 {
 sVersion +=  ;
-sVersion += m_sBuildStr.replaceAll(%BUILDID, sBuildId);
+sVersion += m_sBuildStr.replaceAll($BUILDID, sBuildId);
 }
 
 return sVersion;
diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc
index 40dd4a2..2841155 100644
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@ -27,21 +27,21 @@
 
 #include sfx2/sfx.hrc
 
-#define ABOUT_STR_BUILD 6
-#define ABOUT_STR_VERSION   7
-#define ABOUT_STR_VENDOR8
-#define ABOUT_STR_COPYRIGHT 9
-#define ABOUT_STR_BASED 10
-#define ABOUT_STR_BASED_DERIVED 11
-#define ABOUT_STR_LINK_WEBSITE  13
-#define ABOUT_STR_LINK_CREDITS 15
-#define ABOUT_STR_LINK_LICENSE 22
-#define ABOUT_BTN_CREDITS17
-#define ABOUT_DESCRIPTION_TEXT 18
-#define ABOUT_COPYRIGHT_TEXT 24
-#define ABOUT_COPYRIGHT_TEXT_SHADOW 25
-#define ABOUT_IMAGE_LOGO 19
-#define ABOUT_BTN_WEBSITE20
-#define ABOUT_BTN_LICENSE21
-#define ABOUT_VERSION_TEXT 23
-#define ABOUT_STR_DESCRIPTION 24
+#define ABOUT_STR_BUILD 1
+#define ABOUT_STR_VERSION   2
+#define ABOUT_STR_VENDOR3
+#define ABOUT_STR_COPYRIGHT 4
+#define ABOUT_STR_BASED 5
+#define ABOUT_STR_BASED_DERIVED 6
+#define ABOUT_STR_LINK_WEBSITE  7
+#define ABOUT_STR_LINK_CREDITS  8
+#define ABOUT_STR_LINK_LICENSE  9
+#define ABOUT_BTN_CREDITS   10
+#define ABOUT_DESCRIPTION_TEXT  11
+#define ABOUT_COPYRIGHT_TEXT12
+#define ABOUT_COPYRIGHT_TEXT_SHADOW 13
+#define ABOUT_IMAGE_LOGO14
+#define ABOUT_BTN_WEBSITE   15
+#define ABOUT_BTN_LICENSE   16
+#define ABOUT_VERSION_TEXT  17
+#define ABOUT_STR_DESCRIPTION   18
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index 6de34e5..a962503 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -71,7 +71,7 @@ ModalDialog RID_DEFAULTABOUT
 };
 String ABOUT_STR_VERSION
 {
-Text = version %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX 
%PRODUCTEXTENSION;
+Text [ en-US ] = version 
%ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX %PRODUCTEXTENSION;
 };
 String ABOUT_STR_DESCRIPTION
 {
@@ -95,7 +95,7 @@ ModalDialog RID_DEFAULTABOUT
 };
 String ABOUT_STR_BUILD
 {
-Text[ en-US ] = (Build ID: %BUILDID);
+Text[ en-US ] = (Build ID: $BUILDID);
 };
 String ABOUT_STR_LINK_WEBSITE
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source unusedcode.easy

[Caolán McNamara]

 cui/source/dialogs/about.cxx |4 
 cui/source/dialogs/about.hrc |1 +
 cui/source/dialogs/about.src |7 +++
 cui/source/inc/about.hxx |1 +
 unusedcode.easy  |1 -
 5 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 36245c84bacd30135ba20ad459d9450300c78b00
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Apr 16 16:43:39 2012 +0100

Resolves: fdo#48723 add a (hidden) CancelButton so ESC closes about dialog

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 0703f65..dd39869 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -77,6 +77,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId rId) :
 aCreditsButton   ( this, ResId( ABOUT_BTN_CREDITS, 
*rId.GetResMgr() ) ),
 aWebsiteButton   ( this, ResId( ABOUT_BTN_WEBSITE, 
*rId.GetResMgr() ) ),
 aLicenseButton   ( this, ResId( ABOUT_BTN_LICENSE, 
*rId.GetResMgr() ) ),
+aCancelButton( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr() 
) ),
 aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())),
 m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())),
 m_aCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT, *rId.GetResMgr())),
@@ -110,6 +111,9 @@ AboutDialog::AboutDialog( Window* pParent, const ResId 
rId) :
 aWebsiteButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
 aLicenseButton.SetClickHdl( LINK( this, AboutDialog, HandleClick ) );
 
+aCancelButton.SetClickHdl( LINK( this, AboutDialog, CancelHdl ) );
+aCancelButton.Hide();
+
 FreeResource();
 
 // explicit Help-Id
diff --git a/cui/source/dialogs/about.hrc b/cui/source/dialogs/about.hrc
index 2841155..e2c8a64 100644
--- a/cui/source/dialogs/about.hrc
+++ b/cui/source/dialogs/about.hrc
@@ -45,3 +45,4 @@
 #define ABOUT_BTN_LICENSE   16
 #define ABOUT_VERSION_TEXT  17
 #define ABOUT_STR_DESCRIPTION   18
+#define ABOUT_BTN_CANCEL19
diff --git a/cui/source/dialogs/about.src b/cui/source/dialogs/about.src
index a962503..1e38496 100644
--- a/cui/source/dialogs/about.src
+++ b/cui/source/dialogs/about.src
@@ -122,6 +122,13 @@ ModalDialog RID_DEFAULTABOUT
 Text [ en-US ] = libreoffice.org;
 DefButton = TRUE ;
 };
+CancelButton ABOUT_BTN_CANCEL
+{
+DefButton = TRUE ;
+Pos = MAP_APPFONT ( 174 , 6 ) ;
+Size = MAP_APPFONT ( 50 , 14 ) ;
+Text [ en-US ] = ~Close;
+};
 FixedImage ABOUT_IMAGE_LOGO
 {
 };
diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx
index c94dea1..2a81c37 100644
--- a/cui/source/inc/about.hxx
+++ b/cui/source/inc/about.hxx
@@ -56,6 +56,7 @@ private:
 PushButton  aCreditsButton;
 PushButton  aWebsiteButton;
 PushButton  aLicenseButton;
+CancelButtonaCancelButton;
 
 String aVersionData;
 String aVersionTextStr;
diff --git a/unusedcode.easy b/unusedcode.easy
index 946e677..b016694 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1,4 +1,3 @@
-AboutDialog::LinkStubCancelHdl(void*, void*)
 
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequencesigned
 char, com::sun::star::uno::Sequencesigned char, unsigned char)
 CharAttribList::Clear()
 Dialog::Dialog(Window*, ResId const)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits