[Libreoffice-commits] .: oowintool

[Andras Timar]

 oowintool |   12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 1f9b45377039f5839f8ee4dde265a297ec146062
Author: Andras Timar ati...@suse.com
Date:   Tue Apr 24 09:24:49 2012 +0200

fdo#48259 take MSMDir from registry

diff --git a/oowintool b/oowintool
index 06e6607..3b8d763 100755
--- a/oowintool
+++ b/oowintool
@@ -274,17 +274,9 @@ sub msvc_copy_msms($$)
 {
 # $postfix is empty for x86, and '_x64' for x64
 my ($dest, $postfix) = @_;
-my $common_files_path = $ENV{CommonProgramFiles(x86)};
-if (!defined $common_files_path) {
-$common_files_path = $ENV{CommonProgramFiles};
-if (!defined $common_files_path) {
-$common_files_path = C:\\Program Files\\Common Files;
-}
-}
-
-defined $common_files_path || die Windows CommonProgramFiles not found;
 
-my $msm_path = (cygpath $common_files_path . \\Merge Modules, 'w', 
$output_format);
+my $msm_path = (cygpath reg_get_value 
(HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/VisualStudio/9.0/Setup/VS/MSMDir), 
'w', $output_format);
+defined $msm_path || die MSMDir not found;
 foreach $fname (Microsoft_VC90_CRT_x86$postfix.msm, 
policy_9_0_Microsoft_VC90_CRT_x86$postfix.msm) {
 print STDERR Copying $msm_path/$fname to $dest\n;
 copy ($msm_path/$fname, $dest) || die copy failed: $!;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source setup_native/source

[Andras Timar]

 scp2/source/ooo/windowscustomaction_ooo.scp  |9 ++
 setup_native/source/win32/customactions/sellang/exports.dxp  |1 
 setup_native/source/win32/customactions/sellang/makefile.mk  |3 
 setup_native/source/win32/customactions/sellang/sorttree.cxx |   37 +++
 4 files changed, 49 insertions(+), 1 deletion(-)

New commits:
commit 39bb77fd667f9d9fdaf374f3934b6eec7b7dc57a
Author: Andras Timar ati...@suse.com
Date:   Tue Apr 24 21:51:33 2012 +0200

fdo#46355 sort SelectionTree control of Custom Setup with a custom action

Although Microsoft says that SelectionTree control can publish a control
event only on Windows Server 2003 and above, the  custom action seems to
be working under a fully patched Windows XP SP3. Maybe it fails silently
on older Windows XPs, not to mention Windows 2000. I did not test those.

diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index 70197b7..51cfda1 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -474,6 +474,15 @@ WindowsCustomAction gid_Customaction_SelectLanguage
 Assignment1 = (ControlEvent, SetupType, Next, DoAction, 
SelectLanguage, 1, 1);
 End
 
+WindowsCustomAction gid_Customaction_SortTree
+Name = SortTree;
+Typ = 321;
+Source = sellangmsi.dll;
+Target = SortTree;
+Inbinarytable = 1;
+Assignment1 = (ControlEvent, CustomSetup, Tree, DoAction, 
SortTree, 1, 1);
+End
+
 WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
Name = RebaseLibrariesOnProperties;
Typ = 65;
diff --git a/setup_native/source/win32/customactions/sellang/exports.dxp 
b/setup_native/source/win32/customactions/sellang/exports.dxp
index cc6dd8d..c8a622e 100644
--- a/setup_native/source/win32/customactions/sellang/exports.dxp
+++ b/setup_native/source/win32/customactions/sellang/exports.dxp
@@ -1 +1,2 @@
 SelectLanguage
+SortTree
diff --git a/setup_native/source/win32/customactions/sellang/makefile.mk 
b/setup_native/source/win32/customactions/sellang/makefile.mk
index ffad814..862653e 100644
--- a/setup_native/source/win32/customactions/sellang/makefile.mk
+++ b/setup_native/source/win32/customactions/sellang/makefile.mk
@@ -49,7 +49,8 @@ CFLAGS+=-D_STLP_USE_STATIC_LIB
 UWINAPILIB=
 
 SLOFILES = \
-$(SLO)$/sellang.obj
+$(SLO)/sellang.obj \
+$(SLO)/sorttree.obj
 
 SHL1STDLIBS= \
 $(KERNEL32LIB)\
diff --git a/setup_native/source/win32/customactions/sellang/sorttree.cxx 
b/setup_native/source/win32/customactions/sellang/sorttree.cxx
new file mode 100644
index 000..25c6c6d
--- /dev/null
+++ b/setup_native/source/win32/customactions/sellang/sorttree.cxx
@@ -0,0 +1,37 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Copyright 2012 LibreOffice contributors.
+ *
+ * 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/.
+ */
+
+#ifdef _MSC_VER
+#pragma warning(push, 1) /* disable warnings within system headers */
+#endif
+#define WIN32_LEAN_AND_MEAN
+#include windows.h
+#include msiquery.h
+#include commctrl.h
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+extern C UINT __stdcall SortTree(MSIHANDLE)
+{
+// Sort items (languages) in SelectionTree control, fdo#46355
+
+HWND hwndMSI = FindWindow(TEXT(MsiDialogCloseClass), NULL);
+HWND hwndTV = FindWindowEx(hwndMSI, NULL, TEXT(SysTreeView32), NULL);
+HTREEITEM treeRoot = TreeView_GetRoot(hwndTV);
+HTREEITEM optional = TreeView_GetNextSibling(hwndTV, treeRoot);
+HTREEITEM dicts = TreeView_GetChild(hwndTV, optional);
+TreeView_SortChildren(hwndTV, dicts, TRUE);
+HTREEITEM langs = TreeView_GetNextSibling(hwndTV, optional);
+TreeView_SortChildren(hwndTV, langs, TRUE);
+
+   return ERROR_SUCCESS;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 4 commits - editeng/source linguistic/source sw/source wizards/com

[Andras Timar]

 editeng/source/items/frmitems.cxx   |3 
 linguistic/source/lngprophelp.cxx   |1 
 sw/source/core/doc/doccomp.cxx  |   15 ++-
 wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java |   45 
+++---
 4 files changed, 44 insertions(+), 20 deletions(-)

New commits:
commit cfdd2f747acc85bfc8ee1536ed2e0a4bdfbe2937
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Sun Mar 4 00:57:53 2012 +0100

Dropdown list in Letter Wizard are now ordered alphabetically

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

diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java 
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index 736233c..c7e6e96 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -27,6 +27,8 @@
  /
 package com.sun.star.wizards.letter;
 
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Vector;
 import com.sun.star.lang.IllegalArgumentException;
 import com.sun.star.lang.WrappedTargetException;
@@ -65,6 +67,20 @@ import com.sun.star.wizards.common.Helper;
 public class LetterWizardDialogImpl extends LetterWizardDialog
 {
 
+private class Strings
+{
+public String Norm;
+public String NormPath;
+public String LanguageLabel;
+
+public Strings(String norm, String normPath, String languageLabel)
+{
+Norm = norm;
+NormPath = normPath;
+LanguageLabel = languageLabel;
+}
+}
+
 protected void enterStep(int OldStep, int NewStep)
 {
 }
@@ -1163,9 +1179,8 @@ public class LetterWizardDialogImpl extends 
LetterWizardDialog
 e.printStackTrace();
 }
 
-Vector NormsVector = new Vector();
-Vector NormsPathVector = new Vector();
-Vector LanguageLabelsVector = new Vector();
+Vector StringsVector = new Vector();
+
 String[] LanguageLabels;
 
 boolean found = false;
@@ -1202,21 +1217,25 @@ public class LetterWizardDialogImpl extends 
LetterWizardDialog
 
 if (found)
 {
-NormsVector.add(cIsoCode);
-NormsPathVector.add(nameList[i]);
-LanguageLabelsVector.add(lc.getLanguageString(MSID));
+StringsVector.add(new Strings(cIsoCode, (String)nameList[i], 
lc.getLanguageString(MSID)));
 }
 }
 
+Collections.sort(StringsVector, new Comparator() {
+public int compare(Object a, Object b) {
+return 
((Strings)a).LanguageLabel.compareTo(((Strings)b).LanguageLabel);
+}
+});
 
-Norms = new String[NormsVector.size()];
-NormsVector.toArray(Norms);
-
-NormPaths = new String[NormsPathVector.size()];
-NormsPathVector.toArray(NormPaths);
+Norms = new String[StringsVector.size()];
+NormPaths = new String[StringsVector.size()];
+LanguageLabels = new String[StringsVector.size()];
 
-LanguageLabels = new String[LanguageLabelsVector.size()];
-LanguageLabelsVector.toArray(LanguageLabels);
+for(int i = 0; iStringsVector.size(); i++) {
+Norms[i] = ((Strings)StringsVector.elementAt(i)).Norm;
+NormPaths[i] = ((Strings)StringsVector.elementAt(i)).NormPath;
+LanguageLabels[i] = 
((Strings)StringsVector.elementAt(i)).LanguageLabel;
+}
 
 setControlProperty(lstLetterNorm, PropertyNames.STRING_ITEM_LIST, 
LanguageLabels);
 }
commit fb172ff8a71765799d5e45edebfeae72243dcf46
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Thu Mar 8 14:52:14 2012 +0100

fdo#43424: Comparing empty document with attached one crashes LO

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

diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 8f4f56d..1e1bd06 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -1327,14 +1327,17 @@ void SwCompareData::ShowDelete( const CompareData 
rData, sal_uLong nStt,
 ((SwCompareLine*)rData.GetLine( nEnd-1 ))-GetEndNode(), 1 );
 
 sal_uInt16 nOffset = 0;
-const CompareLine* pLine;
-if( GetLineCount() == nInsPos )
+const CompareLine* pLine = 0;
+if( nInsPos = 1 )
 {
-pLine = GetLine( nInsPos-1 );
-nOffset = 1;
+if( GetLineCount() == nInsPos )
+{
+pLine = GetLine( nInsPos-1 );
+nOffset = 1;
+}
+else
+pLine = GetLine( nInsPos );
 }
-else
-pLine = GetLine( nInsPos );
 
 const SwNode* pLineNd;
 if( pLine )
commit 1ad284007d898c68665c91979be3bd326c290ba1
Author: Dezsi Szabolcs dezsisz...@hotmail.com
Date

[Libreoffice-commits] .: shell/source

[Andras Timar]

 shell/source/win32/shlxthandler/res/shlxthdl.manifest |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 86a85224bcf3191254a4372085cac0ac040c883a
Author: Andras Timar ati...@suse.com
Date:   Mon Apr 23 17:57:17 2012 +0200

s/OpenOffice/LibreOffice/

diff --git a/shell/source/win32/shlxthandler/res/shlxthdl.manifest 
b/shell/source/win32/shlxthandler/res/shlxthdl.manifest
index a785006..36131a3 100755
--- a/shell/source/win32/shlxthandler/res/shlxthdl.manifest
+++ b/shell/source/win32/shlxthandler/res/shlxthdl.manifest
@@ -1,7 +1,7 @@
 ?xml version=1.0 encoding=UTF-8 standalone=yes?
 assembly xmlns=urn:schemas-microsoft-com:asm.v1 manifestVersion=1.0
-assemblyIdentity version=1.0.0.0 processorArchitecture=x86 
name=OpenOffice.shlxthdl type=win32 /
-descriptionOpenOffice Shell Extension/description
+assemblyIdentity version=1.0.0.0 processorArchitecture=x86 
name=LibreOffice.shlxthdl type=win32 /
+descriptionLibreOffice Shell Extension/description
 dependency
 dependentAssembly
 assemblyIdentity type=win32 name=Microsoft.Windows.Common-Controls 
version=6.0.0.0 processorArchitecture=X86
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source

[Andras Timar]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 299387dab1b365427cc44d810026facd30e11a31
Author: Miklos Vajna vmik...@suse.cz
Date:   Fri Apr 20 12:42:23 2012 +0200

fdo#48356 fix RTF import of special unicode characters

The \'0d string should not be an exception when ignoring characters
after the \u control word.

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

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx 
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 9633176..016943d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -784,7 +784,7 @@ int RTFDocumentImpl::resolveChars(char ch)
 bool bSkipped = false;
 while(!Strm().IsEof()  ch != '{'  ch != '}'  ch != '\\')
 {
-if (ch != 0x0d  ch != 0x0a)
+if (m_aStates.top().nInternalState == INTERNAL_HEX || (ch != 0x0d  
ch != 0x0a))
 {
 if (m_aStates.top().nCharsToSkip == 0)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - vcl/source vcl/win

[Andras Timar]

 vcl/source/window/menu.cxx   |5 +++-
 vcl/win/source/gdi/salnativewidgets-luna.cxx |   33 ---
 2 files changed, 29 insertions(+), 9 deletions(-)

New commits:
commit 672071c02622c8ad4b9f23f2a5b885cfe7f72669
Author: Ivan Timofeev timofeev@gmail.com
Date:   Wed Apr 11 21:34:06 2012 +0400

fdo#42537: fix RTL menu rendering on Windows

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

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 3da96c2..92803a9 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2775,7 +2775,10 @@ void Menu::ImplPaint( Window* pWin, sal_uInt16 nBorder, 
long nStartY, MenuItemDa
 aTmpPos.Y() = aOuterCheckRect.Top() + 
(aOuterCheckRect.GetHeight() - nCtrlHeight)/2;
 
 Rectangle aCheckRect( aTmpPos, Size( nCtrlHeight, 
nCtrlHeight ) );
-MenupopupValue aVal( nTextPos-GUTTERBORDER, 
Rectangle( aPos, pData-aSz ) );
+Size aSz( pData-aSz );
+aSz.Width() = aOutSz.Width() - 2*nOuterSpace;
+Rectangle aItemRect( aPos, aSz );
+MenupopupValue aVal( nTextPos-GUTTERBORDER, 
aItemRect );
 pWin-DrawNativeControl( CTRL_MENU_POPUP, nPart,
  aCheckRect,
  nState,
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx 
b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index a4f094f..17b8517 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -989,8 +989,16 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
 if( nPart == PART_ENTIRE_CONTROL )
 {
 RECT aGutterRC = rc;
-aGutterRC.left += aValue.getNumericVal();
-aGutterRC.right = aGutterRC.left+3;
+if( Application::GetSettings().GetLayoutRTL() )
+{
+aGutterRC.right -= aValue.getNumericVal()+1;
+aGutterRC.left = aGutterRC.right-3;
+}
+else
+{
+aGutterRC.left += aValue.getNumericVal();
+aGutterRC.right = aGutterRC.left+3;
+}
 return
 ImplDrawTheme( hTheme, hDC, MENU_POPUPBACKGROUND, 0, rc, 
aCaption ) 
 ImplDrawTheme( hTheme, hDC, MENU_POPUPGUTTER, 0, aGutterRC, 
aCaption )
@@ -1012,13 +1020,18 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
 if( aValue.getType() == CTRL_MENU_POPUP )
 {
 const MenupopupValue rMVal( static_castconst 
MenupopupValue(aValue) );
-aBGRect.left   = rMVal.maItemRect.Left();
 aBGRect.top= rMVal.maItemRect.Top();
 aBGRect.bottom = rMVal.maItemRect.Bottom()+1; // see 
below in drawNativeControl
-aBGRect.right  = rMVal.getNumericVal();
-
-// FIXME: magic
-aBGRect.left += 1; aBGRect.top += 1; aBGRect.bottom 
+=1;
+if( Application::GetSettings().GetLayoutRTL() )
+{
+aBGRect.right = rMVal.maItemRect.Right()+1;
+aBGRect.left = aBGRect.right - 
(rMVal.getNumericVal()-rMVal.maItemRect.Left());
+}
+else
+{
+aBGRect.right = rMVal.getNumericVal();
+aBGRect.left  = rMVal.maItemRect.Left();
+}
 }
 iState = (nState  CTRL_STATE_ENABLED) ? MCB_NORMAL : 
MCB_DISABLED;
 ImplDrawTheme( hTheme, hDC, MENU_POPUPCHECKBACKGROUND, 
iState, aBGRect, aCaption );
@@ -1033,7 +1046,11 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, 
RECT rc,
 }
 else if( nPart == PART_MENU_SEPARATOR )
 {
-rc.left += aValue.getNumericVal(); // adjust for gutter 
position
+// adjust for gutter position
+if( Application::GetSettings().GetLayoutRTL() )
+rc.right -= aValue.getNumericVal()+1;
+else
+rc.left += aValue.getNumericVal()+1;
 Rectangle aRect( ImplGetThemeRect( hTheme, hDC,
 MENU_POPUPSEPARATOR, 0, Rectangle( rc.left, rc.top, 
rc.right, rc.bottom ) ) );
 // center the separator inside the passed rectangle
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http

[Libreoffice-commits] .: 2 commits - l10ntools/inc l10ntools/scripts l10ntools/source scp2/source

[Andras Timar]

 l10ntools/inc/export.hxx|1 +
 l10ntools/scripts/po2lo |2 +-
 l10ntools/source/cfgmerge.cxx   |4 +++-
 l10ntools/source/export.cxx |4 ++--
 scp2/source/ooo/module_langpack.ulf |2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 3f00358bfdad0a18fe053c3d154f74e3aa6afba9
Author: Andras Timar ati...@suse.com
Date:   Sat Apr 14 14:22:13 2012 +0200

export x-comments to sdf file into the 'helptext' field

helptext field has not been in use for a while, so we can
use that to hold the x-comment

diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 760a745..bf1809b 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -72,6 +72,7 @@ typedef boost::unordered_maprtl::OString, MergeData*, 
rtl::OStringHash
 MergeDataHashMap;
 
 #define SOURCE_LANGUAGE rtl::OString(RTL_CONSTASCII_STRINGPARAM(en-US))
+#define X_COMMENT rtl::OString(RTL_CONSTASCII_STRINGPARAM(x-comment))
 #define LIST_REFID  LIST_REFID
 
 typedef OStringHashMap ExportListEntry;
diff --git a/l10ntools/scripts/po2lo b/l10ntools/scripts/po2lo
index 4bcfb8b..cdf8892 100755
--- a/l10ntools/scripts/po2lo
+++ b/l10ntools/scripts/po2lo
@@ -51,7 +51,7 @@ class Entry:
 prefix += %s. % self.items[3]
 self.keys = []
 # 10..13 are translation types
-for idx in range(10, 14):
+for idx in [10,12,13]:
 try:
 if len(self.items[idx]):
 t = {10:'text', 12:'quickhelptext', 13:'title'}[idx]
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 2c39fc6..b8f6c19 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -483,6 +483,7 @@ void CfgExport::WorkOnRessourceEnd()
 if ( 
pStackData-sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM(en-US))].getLength()
 )
 {
 rtl::OString sFallback = 
pStackData-sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM(en-US))];
+rtl::OString sXComment = 
pStackData-sText[rtl::OString(RTL_CONSTASCII_STRINGPARAM(x-comment))];
 rtl::OString sLocalId = pStackData-sIdentifier;
 rtl::OString sGroupId;
 if ( aStack.size() == 1 ) {
@@ -512,7 +513,8 @@ void CfgExport::WorkOnRessourceEnd()
 sOutput += sCur;
 sOutput += \t;
 
-sOutput += sText; sOutput += \t\t\t\t;
+sOutput += sText; sOutput += \t;
+sOutput += sXComment; sOutput += \t\t\t;
 
 pOutputStream  sOutput.getStr()  '\n';
 }
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 60c4a73..329fd19 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -1006,8 +1006,8 @@ sal_Bool Export::WriteData( ResData *pResData, sal_Bool 
bCreateNew )
 sXText = pResData-sText[ SOURCE_LANGUAGE ];
 }
 
-if (!pResData-sHelpText[ sCur ].isEmpty())
-sXHText = pResData-sHelpText[ sCur ];
+if (!pResData-sText[ X_COMMENT ].isEmpty())
+sXHText = pResData-sText[ X_COMMENT ];
 else {
 sXHText = pResData-sHelpText[ SOURCE_LANGUAGE ];
 }
commit af0e727b5dfcdea0555748e7e6415d70fe7665a9
Author: Andras Timar ati...@suse.com
Date:   Sat Apr 14 14:19:56 2012 +0200

fix a typo (BN instead of BN_IN)

diff --git a/scp2/source/ooo/module_langpack.ulf 
b/scp2/source/ooo/module_langpack.ulf
index fa598e9..d321988 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -268,7 +268,7 @@ en-US = Installs the Bengali (Bangladesh) user interface
 [STR_NAME_MODULE_LANGPACK_BN_IN]
 en-US = Bengali (India)
 
-[STR_DESC_MODULE_LANGPACK_BN]
+[STR_DESC_MODULE_LANGPACK_BN_IN]
 en-US = Installs the Bengali (India) user interface
 
 [STR_NAME_MODULE_LANGPACK_OR]
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: setup_native/source

[Andras Timar]

 setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx 
|2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cfa4c9c11538b332234709dedc7ca553a10ab08e
Author: Andras Timar ati...@suse.com
Date:   Thu Apr 12 08:55:45 2012 +0200

typo fix in comment

diff --git 
a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
 
b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index fce807f..c1319e2 100644
--- 
a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ 
b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -101,7 +101,7 @@ extern C UINT __stdcall IsOfficeRunning( MSIHANDLE handle 
)
 if ( sOfficeInstallPath.length() == 0 )
 return ERROR_SUCCESS;
 
-DWORD aProcesses[1024], cbNeeded, cProcesses; /* 1024 processses ought to 
be enough for anybody */
+DWORD aProcesses[1024], cbNeeded, cProcesses; /* 1024 processes ought to 
be enough for anybody */
 
 if ( !EnumProcesses( aProcesses, sizeof(aProcesses), cbNeeded ) )
 return ERROR_INSTALL_FAILURE;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - framework/source officecfg/registry

[Andras Timar]

 framework/source/services/backingwindow.cxx|   19 
++
 officecfg/registry/data/org/openoffice/Office/Accelerators.xcu |7 ---
 2 files changed, 20 insertions(+), 6 deletions(-)

New commits:
commit 5f2825dde8a44773fc6ce19f2dd4e328c4e88eaf
Author: Gábor Stefanik netrolller...@gmail.com
Date:   Thu Apr 12 14:08:02 2012 +0200

fdo#34392 recompute column widths after font scale change in startcenter

diff --git a/framework/source/services/backingwindow.cxx 
b/framework/source/services/backingwindow.cxx
index ca0e9e7..0b07e6f 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -273,6 +273,8 @@ void BackingWindow::DataChanged( const DataChangedEvent 
rDCEvt )
 {
 initBackground();
 Invalidate();
+// fdo#34392: Resize buttons to match the new text size.
+Resize();
 }
 }
 
@@ -797,6 +799,23 @@ void BackingWindow::Resize()
 
 long nYPos = maControlRect.Top() + mnBtnTop;
 
+// Recompute column widths
+mnTextColumnWidth[0] = maWriterButton.GetTextWidth( 
maWriterButton.GetText() ) + maButtonImageSize.Width() + 8;
+if( mnTextColumnWidth[0]  maCalcButton.GetTextWidth( 
maCalcButton.GetText() ) + maButtonImageSize.Width() + 8 )
+mnTextColumnWidth[0] = maCalcButton.GetTextWidth( 
maCalcButton.GetText() ) + maButtonImageSize.Width() + 8;
+if( mnTextColumnWidth[0]  maImpressButton.GetTextWidth( 
maImpressButton.GetText() ) + maButtonImageSize.Width() + 8 )
+mnTextColumnWidth[0] = maImpressButton.GetTextWidth( 
maImpressButton.GetText() ) + maButtonImageSize.Width() + 8;
+if( mnTextColumnWidth[0]  maOpenButton.GetTextWidth( 
maOpenButton.GetText() ) + maButtonImageSize.Width() + 26 )
+mnTextColumnWidth[0] = maOpenButton.GetTextWidth( 
maOpenButton.GetText() ) + maButtonImageSize.Width() + 26;
+
+mnTextColumnWidth[1] = maDrawButton.GetTextWidth( maDrawButton.GetText() ) 
+ maButtonImageSize.Width() + 8;
+if( mnTextColumnWidth[1]  maDBButton.GetTextWidth( maDBButton.GetText() ) 
+ maButtonImageSize.Width() + 8 )
+mnTextColumnWidth[1] = maDBButton.GetTextWidth( maDBButton.GetText() ) 
+ maButtonImageSize.Width() + 8;
+if( mnTextColumnWidth[1]  maMathButton.GetTextWidth( 
maMathButton.GetText() ) + maButtonImageSize.Width() + 8 )
+mnTextColumnWidth[1] = maMathButton.GetTextWidth( 
maMathButton.GetText() ) + maButtonImageSize.Width() + 8;
+if( mnTextColumnWidth[1]  maTemplateButton.GetTextWidth( 
maTemplateButton.GetText() ) + maButtonImageSize.Width() + 8 )
+mnTextColumnWidth[1] = maTemplateButton.GetTextWidth( 
maTemplateButton.GetText() ) + maButtonImageSize.Width() + 8;
+
 maWriterButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos, 
nYPos ), Size( mnTextColumnWidth[0], maButtonImageSize.Height() ) );
 maDrawButton.SetPosSizePixel( Point( maControlRect.Left() + mnBtnPos + 
mnColumnWidth[0], nYPos ), Size( mnTextColumnWidth[1], 
maButtonImageSize.Height() ) );
 nYPos += nBDelta - nDiff;
commit 25c194163c531648f7ad8cdb1a64a03407f75efc
Author: Andras Timar ati...@suse.com
Date:   Thu Apr 12 12:55:55 2012 +0200

fdo#48584 Shift+F3 should be the shourtcut for Edit  Duplicate in Draw

... just like it is in Impress. The fix for fdo#32559 was partially
reverted. I think .uno:CopyObjects is more useful in Draw, than
.uno:ChangeCaseRotateCase.

diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu 
b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index 30702f9..685b7b4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -1131,14 +1131,9 @@
   value xml:lang=en-US.uno:LeaveGroup/value
  /prop
 /node
-!--node oor:name=F3_SHIFT oor:op=replace
- prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS 
- NO TRANSLATE/value
-  value xml:lang=en-US.uno:CopyObjects/value
- /prop
-/node--
 node oor:name=F3_SHIFT oor:op=replace
  prop oor:name=Commandvalue xml:lang=x-no-translateI10N SHORTCUTS 
- NO TRANSLATE/value
-  value xml:lang=en-US.uno:ChangeCaseRotateCase/value
+  value xml:lang=en-US.uno:CopyObjects/value
  /prop
 /node
 node oor:name=F4 oor:op=replace
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/windows/property.pm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ee7084c4f720c932df67c8ff033dab4d8d556179
Author: Andras Timar ati...@suse.com
Date:   Wed Apr 11 16:01:06 2012 +0200

set correct value of FINDPRODUCT property

diff --git a/solenv/bin/modules/installer/windows/property.pm 
b/solenv/bin/modules/installer/windows/property.pm
index 27b19d7..8650883 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -255,9 +255,9 @@ sub set_important_properties
 push(@{$propertyfile}, $onepropertyline);
 }
 
-if (( $allvariables-{'PRODUCTNAME'} )  ( 
$allvariables-{'PRODUCTVERSION'} )  ( $allvariables-{'MANUFACTURER'} )  ( 
$allvariables-{'PRODUCTCODE'} ))
+if (( $allvariables-{'PRODUCTNAME'} )  ( 
$allvariables-{'PRODUCTVERSION'} )  ( $allvariables-{'REGISTRYLAYERNAME'} ))
 {
-my $onepropertyline = FINDPRODUCT . \t . Software\\ . 
$allvariables-{'MANUFACTURER'} . \\ . $allvariables-{'PRODUCTNAME'} . 
$allvariables-{'PRODUCTADDON'} . \\ . $allvariables-{'PRODUCTVERSION'} . 
\\ . $allvariables-{'PRODUCTCODE'} . \n;
+my $onepropertyline = FINDPRODUCT . \t . Software\\LibreOffice . 
\\ . $allvariables-{'REGISTRYLAYERNAME'} . \\ . 
$allvariables-{'PRODUCTNAME'} . \\ . $allvariables-{'PRODUCTVERSION'} . 
\n;
 push(@{$propertyfile}, $onepropertyline);
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack solenv/bin

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt |7 
+++
 instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt |7 
+++
 instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt |3 +++
 solenv/bin/make_installer.pl|4 
 4 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit da2ec9aac3699c951c544a51acd6ab3aede706eb
Author: Andras Timar ati...@suse.com
Date:   Tue Apr 10 20:45:46 2012 +0200

fdo#48411 Find install location during help pack install

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt
new file mode 100644
index 000..85e9539
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/AppSearc.idt
@@ -0,0 +1,7 @@
+Property   Signature_
+s72s72
+AppSearch  PropertySignature_
+INSTALLLOCATIONinstalluser
+INSTALLLOCATIONinstallmachine
+INSTALLLOCATIONinstalluserdev
+INSTALLLOCATIONinstallmachinedev
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt
new file mode 100644
index 000..8a15810
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/RegLocat.idt
@@ -0,0 +1,7 @@
+Signature_ RootKey NameType
+s72i2  s255S255I2
+RegLocator Signature_
+installuser1   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
+installmachine 2   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
+installuserdev 1   
Software\LibreOffice\LayerDev\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
INSTALLLOCATION 2
+installmachinedev  2   
Software\LibreOffice\LayerDev\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
INSTALLLOCATION 2
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt
new file mode 100644
index 000..5004a55
--- /dev/null
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Signatur.idt
@@ -0,0 +1,3 @@
+Signature  FileNameMinVersion  MaxVersion  MinSize MaxSize 
MinDate MaxDate Languages
+s72s255S20 S20 I4  I4  I4  I4  S255
+Signature  Signature
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 21f2077..5cc8306 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -1750,10 +1750,6 @@ for ( my $n = 0; $n = 
$#installer::globals::languageproducts; $n++ )
 # adding the files from the binary directory into the binary table
 installer::windows::binary::update_binary_table($languageidtdir, 
$filesinproductlanguageresolvedarrayref, $binarytablefiles);
 
-# setting patch codes to detect installed products
-
-if (( $installer::globals::patch ) || ( 
$installer::globals::languagepack ) || ( $installer::globals::helppack ) || ( 
$allvariableshashref-{'PDFCONVERTER'} )) { 
installer::windows::patch::update_patch_tables($languageidtdir, 
$allvariableshashref); }
-
 # Adding Windows Installer CustomActions
 
 installer::windows::idtglobal::addcustomactions($languageidtdir, 
$windowscustomactionsarrayref, $filesinproductlanguageresolvedarrayref);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/bin

[Andras Timar]

 solenv/bin/make_installer.pl  |1 
 solenv/bin/modules/installer/windows/patch.pm |  155 --
 2 files changed, 156 deletions(-)

New commits:
commit 13a7880bc0dfc1248f1fdc884ca257248bfad2bb
Author: Andras Timar ati...@suse.com
Date:   Tue Apr 10 21:01:07 2012 +0200

remove unused installer::windows::patch module

diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 5cc8306..baf4b08 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -77,7 +77,6 @@ use installer::windows::media;
 use installer::windows::mergemodule;
 use installer::windows::msiglobal;
 use installer::windows::msp;
-use installer::windows::patch;
 use installer::windows::property;
 use installer::windows::removefile;
 use installer::windows::registry;
diff --git a/solenv/bin/modules/installer/windows/patch.pm 
b/solenv/bin/modules/installer/windows/patch.pm
deleted file mode 100644
index 5364641..000
--- a/solenv/bin/modules/installer/windows/patch.pm
+++ /dev/null
@@ -1,155 +0,0 @@
-#*
-#
-# 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.
-#
-#*
-
-package installer::windows::patch;
-
-use installer::exiter;
-use installer::files;
-use installer::globals;
-use installer::windows::idtglobal;
-
-
-# Creating the file Upgrade.idt dynamically
-# Content:
-# UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty
-
-
-sub update_patch_tables
-{
-my ($basedir, $allvariables) = @_;
-
-my $reglocatfile = ;
-my $appsearchfile = ;
-
-my $reglocatfilename = $basedir . $installer::globals::separator . 
RegLocat.idt;
-my $appsearchfilename = $basedir . $installer::globals::separator . 
AppSearc.idt;
-my $signaturefilename = $basedir . $installer::globals::separator . 
Signatur.idt;
-
-if ( -f $reglocatfilename )
-{
-$reglocatfile = installer::files::read_file($reglocatfilename);
-}
-else
-{
-my @reglocattable = ();
-$reglocatfile = \@reglocattable;
-installer::windows::idtglobal::write_idt_header($reglocatfile, 
reglocat);
-}
-
-if ( -f $appsearchfilename )
-{
-$appsearchfile = installer::files::read_file($appsearchfilename);
-}
-else
-{
-my @appsearchtable = ();
-$appsearchfile = \@appsearchtable;
-installer::windows::idtglobal::write_idt_header($appsearchfile, 
appsearch);
-}
-
-if ( -f $signaturefilename )
-{
-$signaturefile = installer::files::read_file($signaturefilename);
-}
-else
-{
-my @signaturetable = ();
-$signaturefile = \@signaturetable;
-installer::windows::idtglobal::write_idt_header($signaturefile, 
signatur);
-}
-
-# Writing content into this tables
-
-if ( ! $allvariables-{'PATCHCODEFILE'} ) { 
installer::exiter::exit_program(ERROR: Variable PATCHCODEFILE must be defined 
for Windows patches!, update_patch_tables); }
-my $patchcodesfilename = $installer::globals::idttemplatepath  . 
$installer::globals::separator . $allvariables-{'PATCHCODEFILE'};
-my $patchcodefile = installer::files::read_file($patchcodesfilename);
-
-my $number = 0;
-
-for ( my $i = 0; $i = $#{$patchcodefile}; $i++ )
-{
-my $oneline = ${$patchcodefile}[$i];
-
-if ( $oneline =~ /^\s*\#/ ) { next; }   # this is a comment line
-if ( $oneline =~ /^\s*$/ ) { next; }
-
-my $code = ;
-if ( $oneline =~ /^\s*(\S+)\s/ ) { $code = $1; }
-
-foreach my $name ( sort keys %installer::globals::installlocations )
-{
-$number++;
-my $signature = dir . $number . user;
-my $rootvalue = 1;
-my $registryname

[Libreoffice-commits] .: solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/windows/msiglobal.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5a5f77c3b57fb1c91a178190c1db12606295bf17
Author: Andras Timar ati...@suse.com
Date:   Tue Apr 10 21:38:10 2012 +0200

use correct gid of version.ini

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 9ff56c2..52711c6 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -1833,7 +1833,7 @@ sub put_msiproductversion_into_bootstrapfile
 {
 my $onefile = ${$filesref}[$i];
 
-if ( $onefile-{'gid'} eq gid_Profile_Version_Ini )
+if ( $onefile-{'gid'} eq gid_Brand_Profile_Version_Ini )
 {
 my $file = installer::files::read_file($onefile-{'sourcepath'});
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/inc_sdkoo

[Andras Timar]

 instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a4c725f72df1253e5d4e61ede750b4b24c1e1672
Author: Andras Timar ati...@suse.com
Date:   Sun Apr 1 17:37:27 2012 +0200

PRODUCTNAME is not defined in this context, we need BRANDPACKAGEVERSION

diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
index 61c3294..87f622e 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt
@@ -1,7 +1,7 @@
 Signature_ RootKey NameType
 s72i2  s255S255I2
 RegLocator Signature_
-basisinstalluser   1   
Software\LibreOffice\Layers\Basis\[PRODUCTVERSION]  BASISINSTALLLOCATION
2
-basisinstalluser_  1   
Software\LibreOffice\Layers_\Basis\[PRODUCTVERSION] BASISINSTALLLOCATION
2
-basisinstallmachine2   
Software\LibreOffice\Layers\Basis\[PRODUCTVERSION]  BASISINSTALLLOCATION
2
-basisinstallmachine_   2   
Software\LibreOffice\Layers_\Basis\[PRODUCTVERSION] BASISINSTALLLOCATION
2
+basisinstalluser   1   
Software\LibreOffice\Layers\Basis\[BRANDPACKAGEVERSION] BASISINSTALLLOCATION
2
+basisinstalluser_  1   
Software\LibreOffice\Layers_\Basis\[BRANDPACKAGEVERSION]
BASISINSTALLLOCATION2
+basisinstallmachine2   
Software\LibreOffice\Layers\Basis\[BRANDPACKAGEVERSION] BASISINSTALLLOCATION
2
+basisinstallmachine_   2   
Software\LibreOffice\Layers_\Basis\[BRANDPACKAGEVERSION]
BASISINSTALLLOCATION2
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - desktop/source

[Andras Timar]

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 330726cc715df115420b04b974f263a23651e75f
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 2 12:46:43 2012 +0200

fdo#47963 do not increase height of checkboxes

Especially as it is obvious the grow is unbounded .-)

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

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index de324ef..58e06ed 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1247,19 +1247,16 @@ void ExtMgrDialog::Resize()
 long nWidth = m_aBundledCbx.GetCtrlTextWidth( m_aBundledCbx.GetText() );
 Size aBCBSize(m_aBundledCbx.GetSizePixel());
 aBCBSize.Width() = nWidth + 30;
-aBCBSize.Height() += 3;
 m_aBundledCbx.SetSizePixel( aBCBSize );
 
 nWidth = m_aSharedCbx.GetCtrlTextWidth( m_aSharedCbx.GetText() );
 Size aSCBSize(m_aSharedCbx.GetSizePixel());
 aSCBSize.Width() = nWidth + 30;
-aSCBSize.Height() += 3;
 m_aSharedCbx.SetSizePixel( aSCBSize );
 
 nWidth = m_aUserCbx.GetCtrlTextWidth( m_aUserCbx.GetText() );
 Size aUCBSize(m_aUserCbx.GetSizePixel());
 aUCBSize.Width() = nWidth + 30;
-aUCBSize.Height() += 3;
 m_aUserCbx.SetSizePixel( aUCBSize );
 
 offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - 
RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_SP_CTRL_GROUP_X - aBCBSize.Width() - 
aSCBSize.Width() - aUCBSize.Width() );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: post_download.in

[Andras Timar]

 post_download.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a312d8a0a20add8cb6aecda4141e3cc299c1ffbc
Author: Andras Timar ati...@suse.com
Date:   Mon Apr 2 16:48:36 2012 +0200

Bump version number in AC_INIT (I wonder if that is used)

diff --git a/post_download.in b/post_download.in
index 79b637e..0161233 100644
--- a/post_download.in
+++ b/post_download.in
@@ -1,4 +1,4 @@
-AC_INIT([LibreOffice],[3.5],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[3.6],[],[],[http://documentfoundation.org/])
 AC_PREREQ([2.59])
 
 echo 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - scp2/source setup_native/source shell/inc shell/source

[Andras Timar]

 scp2/source/winexplorerext/file_winexplorerext.scp  |  
  3 +
 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |  
  4 -
 setup_native/source/win32/customactions/reg4msdoc/registrar.cxx |  
  4 -
 setup_native/source/win32/customactions/shellextensions/shellextensions.cxx |  
 16 +++---
 shell/inc/internal/config.hxx   |  
  8 +--
 shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx |  
 26 +-
 shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx |  
 12 ++--
 shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx |  
 10 +--
 8 files changed, 43 insertions(+), 40 deletions(-)

New commits:
commit 99d1eff4a843811bf5cb192aa3a2dc29f85d935a
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 27 15:36:11 2012 +0200

replace OpenOffice.org to LibreOffice in registry keys

diff --git 
a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx 
b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 7b9cfc9..4fd1700 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -117,7 +117,7 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
 {   // We will replace registration for word pad
 bRet = true;
 }
-else if ( strncmp( szBuffer, OpenOffice.org., 15 ) == 0 )
+else if ( strncmp( szBuffer, LibreOffice., 15 ) == 0 )
 {   // We will replace registration for our own types, too
 bRet = true;
 }
@@ -330,7 +330,7 @@ static void saveOldRegistration( LPCSTR lpSubKey )
 szBuffer[nSize] = '\0';
 
 // No need to save assocations for our own types
-if ( strncmp( szBuffer, OpenOffice.org., 15 ) != 0 )
+if ( strncmp( szBuffer, LibreOffice., 15 ) != 0 )
 {
 // Save the old association
 RegSetValueExA( hKey, OOoBackupAssociation, 0,
diff --git a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx 
b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
index 5220b1e..967f9c8 100644
--- a/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
+++ b/setup_native/source/win32/customactions/reg4msdoc/registrar.cxx
@@ -55,10 +55,10 @@ namespace /* private */
 
 Registrar::Registrar(const RegistrationContextInformation RegContext) :
 m_ContextInformation(RegContext),
-FORWARD_KEY_PREFIX(LOpenOffice.org),//FORWARD_KEY_PREFIX(Lsoffice6),
+FORWARD_KEY_PREFIX(LLibreOffice),
 DEFAULT_VALUE_NAME(L),
 BACKUP_VALUE_NAME(LBackup),
-
PRIVATE_BACKUP_KEY_NAME(LOpenOffice.org.reg4msdocmsi),//PRIVATE_BACKUP_KEY_NAME(Lsoffice6.bak),
+PRIVATE_BACKUP_KEY_NAME(LLibreOffice.reg4msdocmsi),
 REGISTRATION_STATE(LReg4MsDocState)
 {
 m_RootKey = WindowsRegistry().GetClassesRootKey();
diff --git 
a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx 
b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
index 01f0b30..790a342 100644
--- 
a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
+++ 
b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
@@ -59,10 +59,10 @@
 /MSDN
 
 We add the following entries to the respective registry key
-{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}=OpenOffice.org Column Handler
-{087B3AE3-E237-4467-B8DB-5A38AB959AC9}=OpenOffice.org Infotip Handler
-{63542C48-9552-494A-84F7-73AA6A7C99C1}=OpenOffice.org Property Sheet 
Handler
-{3B092F0C-7696-40E3-A80F-68D74DA84210}=OpenOffice.org Thumbnail Viewer
+{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}=LibreOffice Column Handler
+{087B3AE3-E237-4467-B8DB-5A38AB959AC9}=LibreOffice Infotip Handler
+{63542C48-9552-494A-84F7-73AA6A7C99C1}=LibreOffice Property Sheet 
Handler
+{3B092F0C-7696-40E3-A80F-68D74DA84210}=LibreOffice Thumbnail Viewer
 
 These shell extensions are implemented in the 'shell' project. We ignore 
registration
 failures because of insufficient privileges. The reason is: On systems 
which restrict the
@@ -95,10 +95,10 @@ struct RegistryEntry
 TCHAR* Value;
 };
 
-RegistryEntry ColumnHandler = { 
TEXT({C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}), TEXT(OpenOffice.org Column 
Handler) };
-RegistryEntry InfotipHandler = { 
TEXT({087B3AE3-E237-4467-B8DB-5A38AB959AC9}), TEXT(OpenOffice.org Infotip 
Handler) };
-RegistryEntry PropHandler = { TEXT({63542C48-9552-494A-84F7-73AA6A7C99C1}), 
TEXT(OpenOffice.org Property Sheet Handler) };
-RegistryEntry ThumbViewer = { TEXT({3B092F0C-7696-40E3-A80F-68D74DA84210}), 
TEXT(OpenOffice.org Thumbnail Viewer) };
+RegistryEntry ColumnHandler = { 
TEXT({C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}), TEXT(LibreOffice Column 
Handler

[Libreoffice-commits] .: shell/inc shell/source

[Andras Timar]

 shell/inc/internal/config.hxx|2 +-
 shell/source/win32/shlxthandler/shlxthdl.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a7dc11cfbf351e05e23b66b66574c30c7fbbfc64
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 27 15:47:07 2012 +0200

typo fix

diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index 0d3cbf5..85069bc 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
@@ -46,7 +46,7 @@
 #define COLUMN_HANDLER_DESCRIPTIVE_NAMETEXT(LibreOffice Column Handler)
 #define INFOTIP_HANDLER_DESCRIPTIVE_NAME   TEXT(LibreOffice Infotip Handler)
 #define PROPSHEET_HANDLER_DESCRIPTIVE_NAME TEXT(LibreOffice Property Sheet 
Handler)
-#define THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME TEXT(LibreOffice Thumbnail 
Viewer)
+#define THUMBVIEWER_HANDLER_DESCRIPTIVE_NAME TEXT(LibreOffice Thumbnail 
Viewer)
 
 #define META_CONTENT_NAME   meta.xml
 #define DOC_CONTENT_NAMEcontent.xml
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx 
b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 0d4308c..21257c7 100644
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -339,7 +339,7 @@ extern C STDAPI DllRegisterServer()
 hr = E_FAIL;
 
 if (SUCCEEDED(RegisterThumbviewerHandler(module_path.c_str(
-ApproveShellExtension(CLSID_THUMBVIEWER_HANDLER, 
THUMBVIEWER_HANDLER_DESCRIPTIVAE_NAME);
+ApproveShellExtension(CLSID_THUMBVIEWER_HANDLER, 
THUMBVIEWER_HANDLER_DESCRIPTIVE_NAME);
 else
 hr = E_FAIL;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: setup_native/source

[Andras Timar]

 setup_native/source/win32/customactions/shellextensions/shellextensions.cxx |  
  2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 935150a59b160cc45652b88fd41824b53af3676d
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 27 15:49:22 2012 +0200

typo fix in comment

diff --git 
a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx 
b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
index 790a342..5ddea95 100644
--- 
a/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
+++ 
b/setup_native/source/win32/customactions/shellextensions/shellextensions.cxx
@@ -165,7 +165,7 @@ extern C UINT __stdcall 
InstallExecSequenceEntry(MSIHANDLE hMSI)
 RegCloseKey(hKey);
 }
 
-// Open Windows 32 Bit Registry on Win64 maschine
+// Open Windows 32 Bit Registry on Win64 machine
 
 if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, 
TEXT(Software\\Microsoft\\Windows\\CurrentVersion\\Shell 
Extensions\\Approved),0, KEY_WRITE, hKey ) == ERROR_SUCCESS)
 {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: setup_native/source

[Andras Timar]

 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 45a222a72b49bacddb962bfb34346558e45eff6b
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 27 15:56:50 2012 +0200

fix number of chars in strncmp after OpenOffice.org-LibreOffice change

diff --git 
a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx 
b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
index 4fd1700..c7e4c3b 100644
--- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
+++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx
@@ -117,7 +117,7 @@ static BOOL CheckExtensionInRegistry( LPCSTR lpSubKey )
 {   // We will replace registration for word pad
 bRet = true;
 }
-else if ( strncmp( szBuffer, LibreOffice., 15 ) == 0 )
+else if ( strncmp( szBuffer, LibreOffice., 12 ) == 0 )
 {   // We will replace registration for our own types, too
 bRet = true;
 }
@@ -330,7 +330,7 @@ static void saveOldRegistration( LPCSTR lpSubKey )
 szBuffer[nSize] = '\0';
 
 // No need to save assocations for our own types
-if ( strncmp( szBuffer, LibreOffice., 15 ) != 0 )
+if ( strncmp( szBuffer, LibreOffice., 12 ) != 0 )
 {
 // Save the old association
 RegSetValueExA( hKey, OOoBackupAssociation, 0,
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extras/source

[Andras Timar]

 extras/source/templates/layout/lyt-aqua.otp   |binary
 extras/source/templates/layout/lyt-blackandwhite.otp  |binary
 extras/source/templates/layout/lyt-bluegrey.otp   |binary
 extras/source/templates/layout/lyt-bluelinesgrad.otp  |binary
 extras/source/templates/layout/lyt-bluetitledown.otp  |binary
 extras/source/templates/layout/lyt-book.otp   |binary
 extras/source/templates/layout/lyt-brown.otp  |binary
 extras/source/templates/layout/lyt-charglow.otp   |binary
 extras/source/templates/layout/lyt-forest.otp |binary
 extras/source/templates/layout/lyt-frepa.otp  |binary
 extras/source/templates/layout/lyt-glacier.otp|binary
 extras/source/templates/layout/lyt-greengradlines.otp |binary
 extras/source/templates/layout/lyt-keyboard.otp   |binary
 extras/source/templates/layout/lyt-movwaves.otp   |binary
 extras/source/templates/layout/lyt-numdark.otp|binary
 extras/source/templates/layout/lyt-ocean.otp  |binary
 extras/source/templates/layout/lyt-organic.otp|binary
 extras/source/templates/layout/lyt-paper.otp  |binary
 extras/source/templates/layout/lyt-rededges.otp   |binary
 extras/source/templates/layout/lyt-roundedrect.otp|binary
 extras/source/templates/layout/lyt-sunrise.otp|binary
 extras/source/templates/layout/lyt-techpoly.otp   |binary
 extras/source/templates/layout/lyt-tunnel.otp |binary
 extras/source/templates/layout/lyt-water.otp  |binary
 24 files changed

New commits:
commit b9a0dfd169fa33c976fbc0bd6e869067b940d9d2
Author: Olivier Hallot olivier.hal...@documentfoundation.org
Date:   Mon Mar 26 09:13:06 2012 +0200

fdo#42328 Impress slide backgrounds with Liberation fonts

diff --git a/extras/source/templates/layout/lyt-aqua.otp 
b/extras/source/templates/layout/lyt-aqua.otp
index ded50c2..852702c 100644
Binary files a/extras/source/templates/layout/lyt-aqua.otp and 
b/extras/source/templates/layout/lyt-aqua.otp differ
diff --git a/extras/source/templates/layout/lyt-blackandwhite.otp 
b/extras/source/templates/layout/lyt-blackandwhite.otp
index 6a5eaf0..08c4824 100644
Binary files a/extras/source/templates/layout/lyt-blackandwhite.otp and 
b/extras/source/templates/layout/lyt-blackandwhite.otp differ
diff --git a/extras/source/templates/layout/lyt-bluegrey.otp 
b/extras/source/templates/layout/lyt-bluegrey.otp
index ccae1ea..1892d5f 100644
Binary files a/extras/source/templates/layout/lyt-bluegrey.otp and 
b/extras/source/templates/layout/lyt-bluegrey.otp differ
diff --git a/extras/source/templates/layout/lyt-bluelinesgrad.otp 
b/extras/source/templates/layout/lyt-bluelinesgrad.otp
index 2bce34a..7a6f608 100644
Binary files a/extras/source/templates/layout/lyt-bluelinesgrad.otp and 
b/extras/source/templates/layout/lyt-bluelinesgrad.otp differ
diff --git a/extras/source/templates/layout/lyt-bluetitledown.otp 
b/extras/source/templates/layout/lyt-bluetitledown.otp
index 04087aa..f9992be 100644
Binary files a/extras/source/templates/layout/lyt-bluetitledown.otp and 
b/extras/source/templates/layout/lyt-bluetitledown.otp differ
diff --git a/extras/source/templates/layout/lyt-book.otp 
b/extras/source/templates/layout/lyt-book.otp
index e13e0fb..19343ba 100644
Binary files a/extras/source/templates/layout/lyt-book.otp and 
b/extras/source/templates/layout/lyt-book.otp differ
diff --git a/extras/source/templates/layout/lyt-brown.otp 
b/extras/source/templates/layout/lyt-brown.otp
index edc99bc..d3ce069 100644
Binary files a/extras/source/templates/layout/lyt-brown.otp and 
b/extras/source/templates/layout/lyt-brown.otp differ
diff --git a/extras/source/templates/layout/lyt-charglow.otp 
b/extras/source/templates/layout/lyt-charglow.otp
index 58da646..86c5142 100644
Binary files a/extras/source/templates/layout/lyt-charglow.otp and 
b/extras/source/templates/layout/lyt-charglow.otp differ
diff --git a/extras/source/templates/layout/lyt-forest.otp 
b/extras/source/templates/layout/lyt-forest.otp
index aceb2d2..cfe6ae4 100644
Binary files a/extras/source/templates/layout/lyt-forest.otp and 
b/extras/source/templates/layout/lyt-forest.otp differ
diff --git a/extras/source/templates/layout/lyt-frepa.otp 
b/extras/source/templates/layout/lyt-frepa.otp
index 1fb2089..6baac36 100644
Binary files a/extras/source/templates/layout/lyt-frepa.otp and 
b/extras/source/templates/layout/lyt-frepa.otp differ
diff --git a/extras/source/templates/layout/lyt-glacier.otp 
b/extras/source/templates/layout/lyt-glacier.otp
index 4f35d9d..7e206a6 100644
Binary files a/extras/source/templates/layout/lyt-glacier.otp and 
b/extras/source/templates/layout/lyt-glacier.otp differ
diff --git a/extras/source/templates/layout/lyt-greengradlines.otp 
b/extras/source/templates/layout/lyt-greengradlines.otp
index 3bf32fd..ee8cb09 100644
Binary files a/extras/source/templates/layout/lyt-greengradlines.otp and 
b/extras/source/templates/layout/lyt-greengradlines.otp differ
diff --git 

[Libreoffice-commits] .: extras/source

[Andras Timar]

 extras/source/templates/layout/lyt-wine.otp |binary
 1 file changed

New commits:
commit 8906ad17b72fe2ccbced564a3dbfbb97286fee23
Author: Olivier Hallot olivier.hal...@documentfoundation.org
Date:   Mon Mar 26 09:15:43 2012 +0200

fdo#42328 Impress slide backgrounds with Liberation fonts

diff --git a/extras/source/templates/layout/lyt-wine.otp 
b/extras/source/templates/layout/lyt-wine.otp
index 15457db..8214332 100644
Binary files a/extras/source/templates/layout/lyt-wine.otp and 
b/extras/source/templates/layout/lyt-wine.otp differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: icon-themes/galaxy icon-themes/tango sysui/desktop

[Andras Timar]

 icon-themes/galaxy/res/odf_16_8.png   |binary
 icon-themes/galaxy/res/sx03247.png|binary
 icon-themes/tango/res/odf_16_8.png|binary
 icon-themes/tango/res/sx03247.png |binary
 sysui/desktop/icons/hicolor/16x16/apps/math.png   |binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png |binary
 6 files changed

New commits:
commit b36a42fb831b853120928e05dcf322898a92a731
Author: Andras Timar ati...@suse.com
Date:   Mon Mar 26 12:14:47 2012 +0200

fdo#34324 put 16x16 math icon in RGB color space

diff --git a/icon-themes/galaxy/res/odf_16_8.png 
b/icon-themes/galaxy/res/odf_16_8.png
index ab945b1..5966254 100644
Binary files a/icon-themes/galaxy/res/odf_16_8.png and 
b/icon-themes/galaxy/res/odf_16_8.png differ
diff --git a/icon-themes/galaxy/res/sx03247.png 
b/icon-themes/galaxy/res/sx03247.png
index ab945b1..17c9ffd 100644
Binary files a/icon-themes/galaxy/res/sx03247.png and 
b/icon-themes/galaxy/res/sx03247.png differ
diff --git a/icon-themes/tango/res/odf_16_8.png 
b/icon-themes/tango/res/odf_16_8.png
index ab945b1..17c9ffd 100644
Binary files a/icon-themes/tango/res/odf_16_8.png and 
b/icon-themes/tango/res/odf_16_8.png differ
diff --git a/icon-themes/tango/res/sx03247.png 
b/icon-themes/tango/res/sx03247.png
index ab945b1..17c9ffd 100644
Binary files a/icon-themes/tango/res/sx03247.png and 
b/icon-themes/tango/res/sx03247.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/apps/math.png 
b/sysui/desktop/icons/hicolor/16x16/apps/math.png
index ab945b1..17c9ffd 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/apps/math.png and 
b/sysui/desktop/icons/hicolor/16x16/apps/math.png differ
diff --git a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png 
b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png
index ab945b1..17c9ffd 100644
Binary files a/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png 
and b/sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-formula.png differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/inc_openoffice instsetoo_native/util

[Andras Timar]

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  
  |3 
 instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt 
  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  
  |1 
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt 
  |2 
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
  |  116 -
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
  |3 
 
instsetoo_native/inc_openoffice/windows/msi_templates/upgradecode_remove_ooo.txt
 |  121 --
 instsetoo_native/util/openoffice.lst   
  |2 
 8 files changed, 1 insertion(+), 248 deletions(-)

New commits:
commit 9c327e138ec1877a0befe6ca6829a2ec674006a2
Author: Andras Timar ati...@suse.com
Date:   Fri Mar 23 17:00:18 2012 +0100

old products are unconditionally removed, clean up unused code

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 3014793..28b1614 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -675,6 +675,3 @@ en-US = No applications have been selected for 
installation. Click OK, then sel
 
 [OOO_CONTROL_319]
 en-US  = Create a start link on desktop
-
-[OOO_CONTROL_320]
-en-US  = Remove all older product versions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
index 55fa877..e7f4169 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CheckBox.idt
@@ -3,4 +3,3 @@ s72 S64
 CheckBox   Property
 ISCHECKFORPRODUCTUPDATES   1
 CREATEDESKTOPLINK  1
-REMOVEOLDPRODUCTS  1
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index b932ae5..1a3b3b3 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -232,7 +232,6 @@ ReadyToInstall  DlgTitle2   Text13  6   
280 25  65538   OOO_CONTROL_171
 ReadyToInstall DlgTitle3   Text13  6   280 25  65538   
OOO_CONTROL_172 
 ReadyToInstall InstallNow  PushButton  230 243 66  17  
3   OOO_CONTROL_173 Cancel  
 ReadyToInstall DesktopLink CheckBox21  100 300 10  
3   CREATEDESKTOPLINK   OOO_CONTROL_319 
-ReadyToInstall UpdateCheckBox  CheckBox21  120 200 10  
3   REMOVEOLDPRODUCTS   OOO_CONTROL_320 
 ReadyToRemove  BackPushButton  164 243 66  17  3   
OOO_CONTROL_174 RemoveNow   
 ReadyToRemove  Banner  Bitmap  297 0   77  44  1   
BannerBmp   
 ReadyToRemove  BannerLine  Line0   44  374 0   1   

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
index 478b317..1b874bc 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt
@@ -22,8 +22,6 @@ ReadyToInstallDlgTitleShow
ProgressType0=Modify
 ReadyToInstall DlgTitle2   ShowProgressType0=Repair
 ReadyToInstall DlgTitle3   ShowProgressType0=install
 ReadyToInstall DesktopLink HideNOT DESKTOPLINKEXISTS
-ReadyToInstall UpdateCheckBox  HideOLDPRODUCTS=
-ReadyToInstall UpdateCheckBox  ShowOLDPRODUCTS
 SetupCompleteError BackDefault UpdateStarted
 SetupCompleteError BackDisable NOT UpdateStarted
 SetupCompleteError BackEnable  UpdateStarted
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 13ac5a5..c4db5c2 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -10,122 +10,6 @@ CostInitialize  350
 CreateFolders  1850
 CreateShortcuts2150
 DeleteServices VersionNT   1000
-DontRemoveProducts REMOVEOLDPRODUCTS1  155
-DontRemoveLpafProducts REMOVEOLDPRODUCTS1  160
-DontRemoveLparProducts REMOVEOLDPRODUCTS1  160
-DontRemoveLpasinProducts   REMOVEOLDPRODUCTS1  160
-DontRemoveLpbebyProducts   REMOVEOLDPRODUCTS1  160
-DontRemoveLpboProducts REMOVEOLDPRODUCTS1  160
-DontRemoveLpbgProducts

[Libreoffice-commits] .: instsetoo_native/inc_openoffice

[Andras Timar]

 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt |  117 
--
 1 file changed, 117 deletions(-)

New commits:
commit 91f20d6449f0fca905082a2004af9dfa4f683239
Author: Andras Timar ati...@suse.com
Date:   Fri Mar 23 21:17:11 2012 +0100

remove old product from MSI's CustomAction table

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 8708803..6423f1e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -2,123 +2,6 @@ ActionTypeSource  Target
 s72i2  S64 S255
 CustomAction   Action
 ISInitAllUsers 307 ALLUSERS1
-DontRemoveProducts 51  OLDPRODUCTS {}
-DontRemoveLpafProducts 51  O2LPAF  {}
-DontRemoveLparProducts 51  O2LPAR  {}
-DontRemoveLpasinProducts   51  O2LPASIN{}
-DontRemoveLpbebyProducts   51  O2LPBEBY{}
-DontRemoveLpboProducts 51  O2LPBO  {}
-DontRemoveLpbgProducts 51  O2LPBG  {}
-DontRemoveLpbrProducts 51  O2LPBR  {}
-DontRemoveLpbrxProducts51  O2LPBRX {}
-DontRemoveLpbnProducts 51  O2LPBN  {}
-DontRemoveLpbnbdProducts   51  O2LPBNBD{}
-DontRemoveLpbninProducts   51  O2LPBNIN{}
-DontRemoveLpbsProducts 51  O2LPBS  {}
-DontRemoveLpbyProducts 51  O2LPBY  {}
-DontRemoveLpcaProducts 51  O2LPCA  {}
-DontRemoveLpcsProducts 51  O2LPCS  {}
-DontRemoveLpcyProducts 51  O2LPCY  {}
-DontRemoveLpdaProducts 51  O2LPDA  {}
-DontRemoveLpdeProducts 51  O2LPDE  {}
-DontRemoveLpdgoProducts51  O2LPDGO {}
-DontRemoveLpdzProducts 51  O2LPDZ  {}
-DontRemoveLpelProducts 51  O2LPEL  {}
-DontRemoveLpengbProducts   51  O2LPENGB{}
-DontRemoveLpenusProducts   51  O2LPENUS{}
-DontRemoveLpenzaProducts   51  O2LPENZA{}
-DontRemoveLpeoProducts 51  O2LPEO  {}
-DontRemoveLpesProducts 51  O2LPES  {}
-DontRemoveLpetProducts 51  O2LPET  {}
-DontRemoveLpeuProducts 51  O2LPEU  {}
-DontRemoveLpfaProducts 51  O2LPFA  {}
-DontRemoveLpfiProducts 51  O2LPFI  {}
-DontRemoveLpfrProducts 51  O2LPFR  {}
-DontRemoveLpgaProducts 51  O2LPGA  {}
-DontRemoveLpgdProducts 51  O2LPGD  {}
-DontRemoveLpglProducts 51  O2LPGL  {}
-DontRemoveLpguProducts 51  O2LPGU  {}
-DontRemoveLpguinProducts   51  O2LPGUIN{}
-DontRemoveLpheProducts 51  O2LPHE  {}
-DontRemoveLphiProducts 51  O2LPHI  {}
-DontRemoveLphiinProducts   51  O2LPHIIN{}
-DontRemoveLphrProducts 51  O2LPHR  {}
-DontRemoveLphuProducts 51  O2LPHU  {}
-DontRemoveLpisProducts 51  O2LPIS  {}
-DontRemoveLpitProducts 51  O2LPIT  {}
-DontRemoveLpjaProducts 51  O2LPJA  {}
-DontRemoveLpkidProducts51  O2LPKID {}
-DontRemoveLpkyProducts 51  O2LPKY  {}
-DontRemoveLpkaProducts 51  O2LPKA  {}
-DontRemoveLpkkProducts 51  O2LPKK  {}
-DontRemoveLpkmProducts 51  O2LPKM  {}
-DontRemoveLpknProducts 51  O2LPKN  {}
-DontRemoveLpkoProducts 51  O2LPKO  {}
-DontRemoveLpkokProducts51  O2LPKOK {}
-DontRemoveLpksProducts 51  O2LPKS  {}
-DontRemoveLpkuProducts 51  O2LPKU  {}
-DontRemoveLploProducts 51  O2LPLO  {}
-DontRemoveLpltProducts 51  O2LPLT  {}
-DontRemoveLplvProducts 51  O2LPLV  {}
-DontRemoveLpmaiProducts51  O2LPMAI {}
-DontRemoveLpmkProducts 51  O2LPMK  {}
-DontRemoveLpmnProducts 51  O2LPMN  {}
-DontRemoveLpmniProducts51  O2LPMNI {}
-DontRemoveLpmsProducts 51  O2LPMS  {}
-DontRemoveLpmlinProducts   51  O2LPMLIN{}
-DontRemoveLpmrinProducts   51  O2LPMRIN{}
-DontRemoveLpmyProducts 51  O2LPMY  {}
-DontRemoveLpneProducts 51  O2LPNE  {}
-DontRemoveLpnbProducts 51  O2LPNB  {}
-DontRemoveLpnlProducts 51  O2LPNL  {}
-DontRemoveLpnnProducts 51  O2LPNN  {}
-DontRemoveLpnoProducts 51  O2LPNO  {}
-DontRemoveLpnrProducts 51  O2LPNR  {}
-DontRemoveLpnsProducts 51  O2LPNS  {}
-DontRemoveLpomProducts 51  O2LPOM  {}
-DontRemoveLpocProducts 51  O2LPOC  {}
-DontRemoveLporinProducts   51  O2LPORIN{}
-DontRemoveLppapProducts51  O2LPPAP {}
-DontRemoveLppainProducts   51  O2LPPAIN{}
-DontRemoveLpplProducts 51  O2LPPL  {}
-DontRemoveLppsProducts 51  O2LPPS  {}
-DontRemoveLpptProducts 51  O2LPPT  {}
-DontRemoveLpptbrProducts   51  O2LPPTBR{}
-DontRemoveLpruProducts 51  O2LPRU  {}
-DontRemoveLprwProducts 51  O2LPRW  {}
-DontRemoveLpsatProducts51  O2LPSAT {}
-DontRemoveLpsainProducts   51  O2LPSAIN{}
-DontRemoveLpsiProducts 51  O2LPSI  {}
-DontRemoveLpscProducts 51  O2LPSC  {}
-DontRemoveLpsdProducts 51  O2LPSD  {}
-DontRemoveLpskProducts 51  O2LPSK  {}
-DontRemoveLpslProducts 51

[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt| 
   3 ---
 instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt | 
   3 ---
 instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt| 
   3 ---
 instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt | 
   3 ---
 instsetoo_native/inc_openoffice/windows/msi_templates/codes_broo.txt | 
   5 -
 instsetoo_native/inc_openoffice/windows/msi_templates/codes_broodev.txt  | 
   5 -
 6 files changed, 22 deletions(-)

New commits:
commit 638f45f5a6ed26880fd8a53521b1f1be63ed0d0f
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 20 13:06:11 2012 +0100

remove unused BrOffice files

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt
deleted file mode 100644
index cc1c303..000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/bro_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{1552EC17-8CE9-4E58-A009-991468B8E806} # OOo UpgradeCode
\ No newline at end of file
diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt
deleted file mode 100644
index daf4927..000
--- 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/brodev_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{D8B206B8-6822-48C2-A799-E35BFD585035} # OOo UpgradeCode
\ No newline at end of file
diff --git 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt
deleted file mode 100644
index cc1c303..000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/bro_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{1552EC17-8CE9-4E58-A009-991468B8E806} # OOo UpgradeCode
\ No newline at end of file
diff --git 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt
deleted file mode 100644
index daf4927..000
--- 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/brodev_patchcodes.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# OpenOffice 2 UpgradeCodes
-
-{D8B206B8-6822-48C2-A799-E35BFD585035} # OOo UpgradeCode
\ No newline at end of file
diff --git 
a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broo.txt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broo.txt
deleted file mode 100644
index 43fe6eb..000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broo.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[PRODUCTCODE]
-en-US = {98DE3411-B458-4E3C-B9D8-CA2D5667C22A}
-
-[UPGRADECODE]
-en-US = {1552EC17-8CE9-4E58-A009-991468B8E806}
diff --git 
a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broodev.txt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broodev.txt
deleted file mode 100644
index ddf30c1..000
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/codes_broodev.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[PRODUCTCODE]
-en-US = {0BC79FED-8EB6-4308-8150-D756BEC28383}
-
-[UPGRADECODE]
-en-US = {D8B206B8-6822-48C2-A799-E35BFD585035}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/inc_openoffice solenv/bin

[Andras Timar]

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  |   17 --
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |   10 -
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt |3 
 instsetoo_native/inc_openoffice/windows/msi_templates/Dialog.idt   |1 
 solenv/bin/make_installer.pl   |   14 -
 solenv/bin/modules/installer/windows/idtglobal.pm  |   72 
--
 6 files changed, 117 deletions(-)

New commits:
commit 0778689797eda887dd2f73fbcbed6b478633e734
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 20 13:26:51 2012 +0100

remove unused Language selection dialog from MSI

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index a7cc609..8d351fd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -646,12 +646,6 @@ en-US = Cancel
 [OOO_CONTROL_266]
 en-US = Next 
 
-[OOO_CONTROL_267]
-en-US = Please select the product language for [ProductName].
-
-[OOO_CONTROL_268]
-en-US = {MSSansBold8}Language Selection
-
 [OOO_CONTROL_269]
 en-US = Repair or remove the program.
 
@@ -723,14 +717,3 @@ en-US  = Create a start link on desktop
 
 [OOO_CONTROL_320]
 en-US  = Remove all older product versions
-
-[OOO_CONTROL_LANG_1033]
-en-US = English
-
-[OOO_CONTROL_LANG_1031]
-en-US = German
-
-[OOO_CONTROL_LANG_1034]
-en-US = Spanish
-
-
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index bd48e9a..a3a8347 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -192,16 +192,6 @@ InstallWelcome TextLine2   Text135 55  
228 45  65539   OOO_CONTROL_127
 LanguageInfo1  IconIcon15  15  24  24  5242881 
CautionIco  
 LanguageInfo1  OK  PushButton  100 57  66  17  3   
OOO_CONTROL_10  
 LanguageInfo1  TextText48  15  194 30  3   
OOO_CONTROL_317 
-LanguageSelection  BackPushButton  164 243 66  17  
3   OOO_CONTROL_122 CheckBox1   
-LanguageSelection  Banner  Bitmap  297 0   77  44  1   
BannerBmp   
-LanguageSelection  BannerLine  Line0   44  374 0   
1   
-LanguageSelection  Branding1   Text4   229 88  13  
3   {MSSWhiteSerif8}[ProductName]  
-LanguageSelection  Branding2   Text3   228 88  13  
65537   [ProductName]   
-LanguageSelection  Cancel  PushButton  301 243 66  17  
3   OOO_CONTROL_131 Back
-LanguageSelection  DlgDesc Text21  23  292 25  65539   
OOO_CONTROL_267 
-LanguageSelection  DlgLine Line90  234 284 0   1   

-LanguageSelection  DlgTitleText13  6   292 25  
65539   OOO_CONTROL_268 
-LanguageSelection  NextPushButton  230 243 66  17  
3   OOO_CONTROL_134 Cancel  
 LicenseAgreement   Agree   RadioButtonGroup8   190 330 
40  3   AgreeToLicense  Back
 LicenseAgreement   BackPushButton  164 243 66  17  
3   OOO_CONTROL_128 Next
 LicenseAgreement   Banner  Bitmap  297 0   77  44  1   
BannerBmp   
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 56bf6b9..fb788fd 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -71,9 +71,6 @@ InstallWelcomeCancel  SpawnDialog CancelSetup 
1   0
 InstallWelcome NextNewDialog   LicenseAgreementHIDEEULA  1   0
 InstallWelcome NextNewDialog   CustomerInformation HIDEEULA = 10
 LanguageInfo1  OK  EndDialog   Return  1   0
-LanguageSelection  BackNewDialog   CustomerInformation 1   
1
-LanguageSelection  Cancel  SpawnDialog CancelSetup 1   1
-LanguageSelection  NextNewDialog   SetupType   1   1
 LicenseAgreement   BackNewDialog   InstallWelcome  1   0
 LicenseAgreement   Cancel  SpawnDialog CancelSetup 1   0
 LicenseAgreement   NextNewDialog   CustomerInformation

[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt  |2 --
 instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt |2 --
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt  |2 --
 instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt |2 --
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf   |3 ---
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt   |2 --
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlC.idt  |2 --
 instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt|2 --
 instsetoo_native/inc_sdkoo/windows/msi_templates/ControlC.idt   |2 --
 instsetoo_native/inc_ure/windows/msi_templates/Control.idt  |2 --
 instsetoo_native/inc_ure/windows/msi_templates/ControlC.idt |2 --
 11 files changed, 23 deletions(-)

New commits:
commit dd27492325a073b0a72d751635226cf4130af474
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 20 14:05:36 2012 +0100

LibreOffice installer does not need Serial number

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index e5be5e4..92b5130 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -58,8 +58,6 @@ CustomerInformation   NameEditEdit21  63  
237 17  3   USERNAMEOOO_CONTROL_41  Company
 CustomerInformationNameLabel   Text21  52  75  10  
3   OOO_CONTROL_42  NameEdit
 CustomerInformationNextPushButton  230 243 66  17  
3   OOO_CONTROL_43  Cancel  
 CustomerInformationRadioGroup  RadioButtonGroup63  170 
300 50  3   ApplicationUsersBack
-CustomerInformationSerialLabel Text21  127 109 10  
2   OOO_CONTROL_45  SerialNumber
-CustomerInformationSerialNumberMaskedEdit  21  138 237 
17  2   ISX_SERIALNUM   RadioGroup  
 CustomSetupBackPushButton  164 243 66  17  3   
OOO_CONTROL_46  Next
 CustomSetupBanner  Bitmap  297 0   77  44  1   
BannerBmp   
 CustomSetupBannerLine  Line0   44  374 0   1   

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
index 6f6e3cb..f3a286b 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlC.idt
@@ -7,8 +7,6 @@ CustomerInformation DlgRadioGroupText   Hide
Version9X
 CustomerInformationRadioGroup  HideNOT Privileged
 CustomerInformationRadioGroup  HideProductState  0
 CustomerInformationRadioGroup  HideVersion9X
-CustomerInformationSerialLabel ShowSERIALNUMSHOW
-CustomerInformationSerialNumberShowSERIALNUMSHOW
 CustomSetupChangeFolderHideInstalled
 CustomSetupDetails HideInstalled
 CustomSetupInstallLabelHideInstalled
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index e5be5e4..92b5130 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -58,8 +58,6 @@ CustomerInformation   NameEditEdit21  63  
237 17  3   USERNAMEOOO_CONTROL_41  Company
 CustomerInformationNameLabel   Text21  52  75  10  
3   OOO_CONTROL_42  NameEdit
 CustomerInformationNextPushButton  230 243 66  17  
3   OOO_CONTROL_43  Cancel  
 CustomerInformationRadioGroup  RadioButtonGroup63  170 
300 50  3   ApplicationUsersBack
-CustomerInformationSerialLabel Text21  127 109 10  
2   OOO_CONTROL_45  SerialNumber
-CustomerInformationSerialNumberMaskedEdit  21  138 237 
17  2   ISX_SERIALNUM   RadioGroup  
 CustomSetupBackPushButton  164 243 66  17  3   
OOO_CONTROL_46  Next
 CustomSetupBanner  Bitmap  297 0   77  44  1   
BannerBmp   
 CustomSetupBannerLine  Line0   44  374 0   1   

diff --git 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlC.idt 
b/instsetoo_native

[Libreoffice-commits] .: instsetoo_native/inc_openoffice

[Andras Timar]

 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5e7dab83e6425a2e2e8bf9f4cf496669aa6713f6
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 20 14:28:03 2012 +0100

amended UI text in MSI

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 90d331e..194da51 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -704,10 +704,10 @@ en-US  = Install [ProductName] to:
 en-US = If you are just trying out [ProductName], you probably don't want 
this to happen, so leave the boxes unchecked.
 
 [OOO_CONTROL_317]
-en-US = No languages have been selected for installation. Click OK to select 
one or more languages for installation.
+en-US = No languages have been selected for installation. Click OK, then 
select one or more languages for installation.
 
 [OOO_CONTROL_318]
-en-US = No applications have been selected for installation. Click OK to 
select one or more applications for installation.
+en-US = No applications have been selected for installation. Click OK, then 
select one or more applications for installation.
 
 [OOO_CONTROL_319]
 en-US  = Create a start link on desktop
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt |3 +--
 instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt |3 +--
 instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt  |3 +--
 instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt   |3 +--
 instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt |3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit ea3967103430b96e5cd2c4d201840a0d827d9d76
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 20 21:41:49 2012 +0100

remove last traces of serial number check from MSI

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
index b03c291..e478ce0 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation   BackNewDialog   InstallWelcome  
1   1
 CustomerInformationCancel  SpawnDialog CancelSetup 1   0
 CustomerInformationNext[ALLUSERS]  {}  ApplicationUsers = 
OnlyCurrentUser And Privileged 2
 CustomerInformationNext[ALLUSERS]  1   ApplicationUsers = 
AllUsers And Privileged1
-CustomerInformationNextEndDialog   Exit
(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT0) And 
(SERIALNUMVALRETURNSERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformationNextNewDialog   SetupType   ((Not 
SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))4
+CustomerInformationNextNewDialog   SetupType   1   3
 CustomSetupBackNewDialog   MaintenanceType Installed   0
 CustomSetupBackNewDialog   SetupType   NOT Installed   0
 CustomSetupCancel  SpawnDialog CancelSetup 1   0
diff --git 
a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
index b03c291..e478ce0 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation   BackNewDialog   InstallWelcome  
1   1
 CustomerInformationCancel  SpawnDialog CancelSetup 1   0
 CustomerInformationNext[ALLUSERS]  {}  ApplicationUsers = 
OnlyCurrentUser And Privileged 2
 CustomerInformationNext[ALLUSERS]  1   ApplicationUsers = 
AllUsers And Privileged1
-CustomerInformationNextEndDialog   Exit
(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT0) And 
(SERIALNUMVALRETURNSERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformationNextNewDialog   SetupType   ((Not 
SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))4
+CustomerInformationNextNewDialog   SetupType   1   3
 CustomSetupBackNewDialog   MaintenanceType Installed   0
 CustomSetupBackNewDialog   SetupType   NOT Installed   0
 CustomSetupCancel  SpawnDialog CancelSetup 1   0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
index 3eb1b85..b32bd00 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt
@@ -22,8 +22,7 @@ CustomerInformation   BackNewDialog   InstallWelcome  
1   1
 CustomerInformationCancel  SpawnDialog CancelSetup 1   0
 CustomerInformationNext[ALLUSERS]  {}  ApplicationUsers = 
OnlyCurrentUser And Privileged 2
 CustomerInformationNext[ALLUSERS]  1   ApplicationUsers = 
AllUsers And Privileged1
-CustomerInformationNextEndDialog   Exit
(SERIALNUMVALRETRYLIMIT) And (SERIALNUMVALRETRYLIMIT0) And 
(SERIALNUMVALRETURNSERIALNUMVALSUCCESSRETVAL) 3
-CustomerInformationNextNewDialog   SetupType   ((Not 
SERIALNUMVALRETURN) OR (SERIALNUMVALRETURN=SERIALNUMVALSUCCESSRETVAL))4
+CustomerInformationNextNewDialog   SetupType   1   3
 CustomSetupBackNewDialog   MaintenanceType Installed   0
 CustomSetupBackNewDialog   SetupType   NOT Installed   0
 CustomSetupCancel  SpawnDialog CancelSetup 1   0
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
index 05254de..e0476e9 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt
@@ -21,8 +21,7 @@ CustomerInformation   BackNewDialog   InstallWelcome  
1   1

[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |1 -
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |1 -
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  |3 ---
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |1 -
 instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt   |1 -
 instsetoo_native/inc_ure/windows/msi_templates/Control.idt |1 -
 6 files changed, 8 deletions(-)

New commits:
commit 90ec7ecb86f4cc2005ac1c5a7e70b19fbdc02426
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 20 21:55:28 2012 +0100

remove last traces of serial number check from MSI

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index e9a7742..1369af6 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -48,7 +48,6 @@ CustomerInformation   BannerLine  Line0   44  
374 0   1
 CustomerInformationBranding1   Text4   229 140 13  
3   {MSSWhiteSerif8}[ProductName]  
 CustomerInformationBranding2   Text3   228 140 13  
65537   [ProductName]   
 CustomerInformationCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_35  NameLabel   
-CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  SerialLabel 
 CustomerInformationCompanyLabelText21  89  75  10  
3   OOO_CONTROL_37  CompanyEdit 
 CustomerInformationDlgDesc Text21  23  272 25  65539   
OOO_CONTROL_38  
 CustomerInformationDlgLine Line145 234 229 0   1   

diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index e9a7742..1369af6 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -48,7 +48,6 @@ CustomerInformation   BannerLine  Line0   44  
374 0   1
 CustomerInformationBranding1   Text4   229 140 13  
3   {MSSWhiteSerif8}[ProductName]  
 CustomerInformationBranding2   Text3   228 140 13  
65537   [ProductName]   
 CustomerInformationCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_35  NameLabel   
-CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  SerialLabel 
 CustomerInformationCompanyLabelText21  89  75  10  
3   OOO_CONTROL_37  CompanyEdit 
 CustomerInformationDlgDesc Text21  23  272 25  65539   
OOO_CONTROL_38  
 CustomerInformationDlgLine Line145 234 229 0   1   

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index 249120b..5c54cc9 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -76,9 +76,6 @@ en-US =  Back
 [OOO_CONTROL_35]
 en-US = Cancel
 
-[OOO_CONTROL_36]
-en-US = {\Tahoma8}{80}
-
 [OOO_CONTROL_37]
 en-US = Organization:
 
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 7599ae5..05a7a79 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -51,7 +51,6 @@ CustomerInformation   BannerLine  Line0   44  
374 0   1
 CustomerInformationBranding1   Text4   229 88  13  
3   {MSSWhiteSerif8}[ProductName]  
 CustomerInformationBranding2   Text3   228 88  13  
65537   [ProductName]   
 CustomerInformationCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_35  NameLabel   
-CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  SerialLabel 
 CustomerInformationCompanyLabelText21  89  75  10  
3   OOO_CONTROL_37  CompanyEdit 
 CustomerInformationDlgDesc Text21  23  272 25  65539   
OOO_CONTROL_38  
 CustomerInformationDlgLine

[Libreoffice-commits] .: 2 commits - instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |1 +
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |1 +
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  |3 +++
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |1 +
 instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt   |1 +
 instsetoo_native/inc_ure/windows/msi_templates/Control.idt |1 +
 6 files changed, 8 insertions(+)

New commits:
commit a82dee49aade4685af6a9b8f153cc5e7673a36ca
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 20 22:06:42 2012 +0100

fix control order in MSI

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index e9a7742..9cde5eb 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -48,7 +48,7 @@ CustomerInformation   BannerLine  Line0   44  
374 0   1
 CustomerInformationBranding1   Text4   229 140 13  
3   {MSSWhiteSerif8}[ProductName]  
 CustomerInformationBranding2   Text3   228 140 13  
65537   [ProductName]   
 CustomerInformationCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_35  NameLabel   
-CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  SerialLabel 
+CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  Next
 CustomerInformationCompanyLabelText21  89  75  10  
3   OOO_CONTROL_37  CompanyEdit 
 CustomerInformationDlgDesc Text21  23  272 25  65539   
OOO_CONTROL_38  
 CustomerInformationDlgLine Line145 234 229 0   1   

diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index e9a7742..9cde5eb 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -48,7 +48,7 @@ CustomerInformation   BannerLine  Line0   44  
374 0   1
 CustomerInformationBranding1   Text4   229 140 13  
3   {MSSWhiteSerif8}[ProductName]  
 CustomerInformationBranding2   Text3   228 140 13  
65537   [ProductName]   
 CustomerInformationCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_35  NameLabel   
-CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  SerialLabel 
+CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  Next
 CustomerInformationCompanyLabelText21  89  75  10  
3   OOO_CONTROL_37  CompanyEdit 
 CustomerInformationDlgDesc Text21  23  272 25  65539   
OOO_CONTROL_38  
 CustomerInformationDlgLine Line145 234 229 0   1   

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index 7599ae5..acd4bd0 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -51,7 +51,7 @@ CustomerInformation   BannerLine  Line0   44  
374 0   1
 CustomerInformationBranding1   Text4   229 88  13  
3   {MSSWhiteSerif8}[ProductName]  
 CustomerInformationBranding2   Text3   228 88  13  
65537   [ProductName]   
 CustomerInformationCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_35  NameLabel   
-CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  SerialLabel 
+CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  Next
 CustomerInformationCompanyLabelText21  89  75  10  
3   OOO_CONTROL_37  CompanyEdit 
 CustomerInformationDlgDesc Text21  23  272 25  65539   
OOO_CONTROL_38  
 CustomerInformationDlgLine Line90  234 284 0   1   

diff --git a/instsetoo_native/inc_sdkoo

[Libreoffice-commits] .: instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/inc_ure

[Andras Timar]

 instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |2 +-
 instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt  |2 +-
 instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt   |2 +-
 instsetoo_native/inc_ure/windows/msi_templates/Control.idt |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8941a9ad0173f10b5d7cf4c7d254d79c886f36b2
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 20 22:50:14 2012 +0100

fix control order in MSI, this time for real

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index 9cde5eb..f798e24 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -48,7 +48,7 @@ CustomerInformation   BannerLine  Line0   44  
374 0   1
 CustomerInformationBranding1   Text4   229 140 13  
3   {MSSWhiteSerif8}[ProductName]  
 CustomerInformationBranding2   Text3   228 140 13  
65537   [ProductName]   
 CustomerInformationCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_35  NameLabel   
-CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  Next
+CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  RadioGroup  
 CustomerInformationCompanyLabelText21  89  75  10  
3   OOO_CONTROL_37  CompanyEdit 
 CustomerInformationDlgDesc Text21  23  272 25  65539   
OOO_CONTROL_38  
 CustomerInformationDlgLine Line145 234 229 0   1   

diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
index 9cde5eb..f798e24 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/Control.idt
@@ -48,7 +48,7 @@ CustomerInformation   BannerLine  Line0   44  
374 0   1
 CustomerInformationBranding1   Text4   229 140 13  
3   {MSSWhiteSerif8}[ProductName]  
 CustomerInformationBranding2   Text3   228 140 13  
65537   [ProductName]   
 CustomerInformationCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_35  NameLabel   
-CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  Next
+CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  RadioGroup  
 CustomerInformationCompanyLabelText21  89  75  10  
3   OOO_CONTROL_37  CompanyEdit 
 CustomerInformationDlgDesc Text21  23  272 25  65539   
OOO_CONTROL_38  
 CustomerInformationDlgLine Line145 234 229 0   1   

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
index acd4bd0..240b178 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Control.idt
@@ -51,7 +51,7 @@ CustomerInformation   BannerLine  Line0   44  
374 0   1
 CustomerInformationBranding1   Text4   229 88  13  
3   {MSSWhiteSerif8}[ProductName]  
 CustomerInformationBranding2   Text3   228 88  13  
65537   [ProductName]   
 CustomerInformationCancel  PushButton  301 243 66  17  
3   OOO_CONTROL_35  NameLabel   
-CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  Next
+CustomerInformationCompanyEdit Edit21  100 237 17  
3   COMPANYNAME OOO_CONTROL_36  RadioGroup  
 CustomerInformationCompanyLabelText21  89  75  10  
3   OOO_CONTROL_37  CompanyEdit 
 CustomerInformationDlgDesc Text21  23  272 25  65539   
OOO_CONTROL_38  
 CustomerInformationDlgLine Line90  234 284 0   1   

diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Control.idt 
b

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - readlicense_oo/html readlicense_oo/odt readlicense_oo/txt

[Andras Timar]

 readlicense_oo/html/THIRDPARTYLICENSEREADME.html |   65 +++
 readlicense_oo/odt/LICENSE.odt   |binary
 readlicense_oo/txt/license.txt   |   65 +++
 3 files changed, 130 insertions(+)

New commits:
commit 00fb6dcf450599aece31ec8ab3a46f63eb842bac
Author: Andras Timar ati...@suse.com
Date:   Mon Mar 19 13:26:28 2012 +0100

update of license document

added Info-ZIP license

Signed-off-by: Michael Meeks mme...@suse.com

diff --git a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html 
b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
index c32b3a3..3e26461 100644
--- a/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
+++ b/readlicense_oo/html/THIRDPARTYLICENSEREADME.html
@@ -2443,6 +2443,71 @@ not be misrepresented as being the original software./P
 P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 
0.3cm
 3. This notice may not be removed or altered from any source
 distribution./P
+P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 
0.3cm
+LibreOffice uses unzip.c from zlib's contrib/minizip directory. This file
+was derived from Info-ZIP's unzip.c, which is under the Info-ZIP License:/P
+P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 
0.3cm
+This is version 2007-Mar-4 of the Info-ZIP license.
+The definitive version of this document should be available at
+a 
href=ftp://ftp.info-zip.org/pub/infozip/license.html;ftp://ftp.info-zip.org/pub/infozip/license.html/a
 indefinitely and
+a copy at http://www.info-zip.org/pub/infozip/license.html./P
+P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 
0.3cm
+Copyright (c) 1990-2007 Info-ZIP.  All rights reserved./P
+P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 
0.3cm
+For the purposes of this copyright and license, Info-ZIP is defined as
+the following set of individuals:/P
+BLOCKQUOTEP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; 
margin-bottom: 0.3cm
+Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
+Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth,
+Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz,
+David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko,
+Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs,
+Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda,
+Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren,
+Rich Wales, Mike White./P/BLOCKQUOTE
+P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 
0.3cm
+This software is provided as is, without warranty of any kind, express
+or implied.  In no event shall Info-ZIP or its contributors be held liable
+for any direct, indirect, incidental, special or consequential damages
+arising out of the use of or inability to use this software./P
+P LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 
0.3cm
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the above disclaimer and the following restrictions:/P
+OL
+LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 
0.3cm
+Redistributions of source code (in whole or in part) must retain
+the above copyright notice, definition, disclaimer, and this list
+of conditions./P/LI
+LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 
0.3cm
+Redistributions in binary form (compiled executables and libraries)
+must reproduce the above copyright notice, definition, disclaimer,
+and this list of conditions in documentation and/or other materials
+provided with the distribution.  The sole exception to this condition
+is redistribution of a standard UnZipSFX binary (including SFXWiz) as
+part of a self-extracting archive; that is permitted without inclusion
+of this license, as long as the normal SFX banner has not been removed
+from the binary or disabled./P/LI
+LIP LANG=en-US CLASS=western STYLE=margin-top: 0.3cm; margin-bottom: 
0.3cm
+Altered versions--including, but not limited to, ports to new operating
+systems, existing ports with new graphical interfaces, versions with
+modified or added functionality, and dynamic, shared, or static library
+versions not from Info-ZIP--must be plainly marked as such and must not
+be misrepresented as being the original source or, if binaries,
+compiled from the original source.  Such altered versions also must not
+be misrepresented as being Info-ZIP releases--including, but not
+limited to, labeling of the altered versions with the names Info-ZIP
+(or any variation thereof, including, but not limited to, different
+capitalizations), Pocket UnZip, WiZ or MacZip without the
+explicit permission of Info-ZIP.  Such altered versions are further
+prohibited from misrepresentative use of the Zip-Bugs or Info-ZIP
+e-mail addresses or the Info-ZIP URL(s

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Andras Timar]

 sc/source/ui/view/prevwsh.cxx  |7 ++-
 sc/source/ui/view/printfun.cxx |7 ++-
 sc/source/ui/view/tabvwsh4.cxx |8 +++-
 3 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 1f26de8f2438170db504f67b82544965b9869c5e
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Thu Mar 15 15:23:17 2012 +0100

i#84393 Fix title field in header, footer

According to help Title should be the Title property of the document,
not the file name without extension. If that property is missing, we
fall back to file name without extension.

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

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index ef995ba..12ae9d1 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -75,6 +75,7 @@
 #include svx/dialogs.hrc
 
 #include svx/zoom_def.hxx
+#include com/sun/star/document/XDocumentProperties.hpp
 
 #include sc.hrc
 #include scabstdlg.hxx
@@ -840,7 +841,11 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData 
rData )
 pDoc-GetName(nTab, aTmp);
 rData.aTabName = aTmp;
 
-rData.aTitle= pDocShell-GetTitle();
+if( pDocShell-getDocProperties()-getTitle().getLength() != 0 )
+rData.aTitle = pDocShell-getDocProperties()-getTitle();
+else
+rData.aTitle = pDocShell-GetTitle();
+
 const INetURLObject rURLObj = pDocShell-GetMedium()-GetURLObject();
 rData.aLongDocName  = rURLObj.GetMainURL( 
INetURLObject::DECODE_UNAMBIGUOUS );
 if ( rData.aLongDocName.Len() )
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index e6484ce..73583b4 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -83,6 +83,7 @@
 #include vcl/lineinfo.hxx
 
 #include boost/scoped_ptr.hpp
+#include com/sun/star/document/XDocumentProperties.hpp
 
 #define ZOOM_MIN10
 
@@ -1037,7 +1038,11 @@ void ScPrintFunc::InitParam( const ScPrintOptions* 
pOptions )
 
 SetDateTime( Date( Date::SYSTEM ), Time( Time::SYSTEM ) );
 
-aFieldData.aTitle   = pDocShell-GetTitle();
+if( pDocShell-getDocProperties()-getTitle().getLength() != 0 )
+aFieldData.aTitle = pDocShell-getDocProperties()-getTitle();
+else
+aFieldData.aTitle = pDocShell-GetTitle();
+
 const INetURLObject rURLObj = pDocShell-GetMedium()-GetURLObject();
 aFieldData.aLongDocName = rURLObj.GetMainURL( 
INetURLObject::DECODE_UNAMBIGUOUS );
 if ( aFieldData.aLongDocName.Len() )
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index f8e2ab8..ffb64a3 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -97,6 +97,8 @@
 #include markdata.hxx
 #include preview.hxx
 
+#include com/sun/star/document/XDocumentProperties.hpp
+
 void ActivateOlk( ScViewData* pViewData );
 void DeActivateOlk( ScViewData* pViewData );
 
@@ -1824,7 +1826,11 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData 
rData )
 pDoc-GetName(nTab, aTmp);
 rData.aTabName = aTmp;
 
-rData.aTitle= pDocShell-GetTitle();
+if( pDocShell-getDocProperties()-getTitle().getLength() != 0 )
+rData.aTitle = pDocShell-getDocProperties()-getTitle();
+else
+rData.aTitle = pDocShell-GetTitle();
+
 const INetURLObject rURLObj = pDocShell-GetMedium()-GetURLObject();
 rData.aLongDocName  = rURLObj.GetMainURL( 
INetURLObject::DECODE_UNAMBIGUOUS );
 if ( rData.aLongDocName.Len() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sc/source

[Andras Timar]

 sc/source/ui/view/prevwsh.cxx  |7 ++-
 sc/source/ui/view/printfun.cxx |7 ++-
 sc/source/ui/view/tabvwsh4.cxx |8 +++-
 3 files changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 010560f553ee361ccda4bd14f1ee6b3f18250847
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Thu Mar 15 15:23:17 2012 +0100

i#84393 Fix title field in header, footer

According to help Title should be the Title property of the document,
not the file name without extension. If that property is missing, we
fall back to file name without extension.

diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index ccb10ee..85dd306 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -77,6 +77,7 @@
 
 #include basegfx/tools/zoomtools.hxx
 #include svx/zoom_def.hxx
+#include com/sun/star/document/XDocumentProperties.hpp
 
 #include sc.hrc
 #include scabstdlg.hxx
@@ -844,7 +845,11 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData 
rData )
 pDoc-GetName(nTab, aTmp);
 rData.aTabName = aTmp;
 
-rData.aTitle= pDocShell-GetTitle();
+if( pDocShell-getDocProperties()-getTitle().getLength() != 0 )
+rData.aTitle = pDocShell-getDocProperties()-getTitle();
+else
+rData.aTitle = pDocShell-GetTitle();
+
 const INetURLObject rURLObj = pDocShell-GetMedium()-GetURLObject();
 rData.aLongDocName  = rURLObj.GetMainURL( 
INetURLObject::DECODE_UNAMBIGUOUS );
 if ( rData.aLongDocName.Len() )
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 01f1b5b..9d82ba5 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -83,6 +83,7 @@
 #include vcl/lineinfo.hxx
 
 #include boost/scoped_ptr.hpp
+#include com/sun/star/document/XDocumentProperties.hpp
 
 #define ZOOM_MIN10
 
@@ -1037,7 +1038,11 @@ void ScPrintFunc::InitParam( const ScPrintOptions* 
pOptions )
 
 SetDateTime( Date( Date::SYSTEM ), Time( Time::SYSTEM ) );
 
-aFieldData.aTitle   = pDocShell-GetTitle();
+if( pDocShell-getDocProperties()-getTitle().getLength() != 0 )
+aFieldData.aTitle = pDocShell-getDocProperties()-getTitle();
+else
+aFieldData.aTitle = pDocShell-GetTitle();
+
 const INetURLObject rURLObj = pDocShell-GetMedium()-GetURLObject();
 aFieldData.aLongDocName = rURLObj.GetMainURL( 
INetURLObject::DECODE_UNAMBIGUOUS );
 if ( aFieldData.aLongDocName.Len() )
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index cf93d15..35c2c54 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -97,6 +97,8 @@
 #include markdata.hxx
 #include preview.hxx
 
+#include com/sun/star/document/XDocumentProperties.hpp
+
 void ActivateOlk( ScViewData* pViewData );
 void DeActivateOlk( ScViewData* pViewData );
 
@@ -1824,7 +1826,11 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData 
rData )
 pDoc-GetName(nTab, aTmp);
 rData.aTabName = aTmp;
 
-rData.aTitle= pDocShell-GetTitle();
+if( pDocShell-getDocProperties()-getTitle().getLength() != 0 )
+rData.aTitle = pDocShell-getDocProperties()-getTitle();
+else
+rData.aTitle = pDocShell-GetTitle();
+
 const INetURLObject rURLObj = pDocShell-GetMedium()-GetURLObject();
 rData.aLongDocName  = rURLObj.GetMainURL( 
INetURLObject::DECODE_UNAMBIGUOUS );
 if ( rData.aLongDocName.Len() )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: autodoc/source odk/docs odk/examples odk/index.html odk/index_online.html

[Andras Timar]

 autodoc/source/display/html/cfrstd.cxx |2 +-
 odk/docs/install.html  |2 +-
 odk/docs/notsupported.html |2 +-
 odk/docs/tools.html|2 +-
 odk/examples/DevelopersGuide/examples.html |2 +-
 odk/examples/examples.html |2 +-
 odk/index.html |2 +-
 odk/index_online.html  |2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6c412d2e6923f99e3c351eee5d36822ec2768df9
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 13 11:52:27 2012 +0100

change Privacy and Legal URLs in API doc

diff --git a/autodoc/source/display/html/cfrstd.cxx 
b/autodoc/source/display/html/cfrstd.cxx
index ed8e1a7..74d49e7 100644
--- a/autodoc/source/display/html/cfrstd.cxx
+++ b/autodoc/source/display/html/cfrstd.cxx
@@ -343,7 +343,7 @@ MakeCopyRight()
 p class=\copyright\ align=\center\LibreOffice was created by 
The Document Foundation, based on OpenOffice.org, which is Copyright 2000, 2010 
Oracle and/or its affiliates./p
 p class=\copyright\ align=\center\The Document Foundation 
acknowledges all community members, please find more info a 
href=\http://www.libreoffice.org/about-us/credits/\; target=\_blank\at our 
website/a.
 pnbsp;/p
-p class=\copyright\ align=\center\a 
href=\http://www.libreoffice.org/privacy\; target=\_blank\Privacy 
Policy/a | a href=\http://www.libreoffice.org/imprint\; 
target=\_blank\Impressum (Legal Info)/a | Copyright information: The 
source code of LibreOffice is licensed under the GNU Lesser General Public 
License (a href=\http://www.libreoffice.org/download/license/\; 
target=\_blank\LGPLv3/a). \LibreOffice\ and \The Document Foundation\ 
are registered trademarks of their corresponding registered owners or are in 
actual use as trademarks in one or more countries. Their respective logos and 
icons are also subject to international copyright laws. Use thereof is 
explained in our a 
href=\http://wiki.documentfoundation.org/TradeMark_Policy\; 
target=\_blank\trademark policy/a.;
+p class=\copyright\ align=\center\a 
href=\http://www.documentfoundation.org/privacy\; target=\_blank\Privacy 
Policy/a | a href=\http://www.documentfoundation.org/imprint\; 
target=\_blank\Impressum (Legal Info)/a | Copyright information: The 
source code of LibreOffice is licensed under the GNU Lesser General Public 
License (a href=\http://www.libreoffice.org/download/license/\; 
target=\_blank\LGPLv3/a). \LibreOffice\ and \The Document Foundation\ 
are registered trademarks of their corresponding registered owners or are in 
actual use as trademarks in one or more countries. Their respective logos and 
icons are also subject to international copyright laws. Use thereof is 
explained in our a 
href=\http://wiki.documentfoundation.org/TradeMark_Policy\; 
target=\_blank\trademark policy/a.;
 return String(cr.c_str());
 
 }
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 38ff7ac..6ec6834 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -403,7 +403,7 @@
 nbsp;
 /p
 p
-a href=http://www.libreoffice.org/privacy; 
target=_blankPrivacy Policy/a | a 
href=http://www.libreoffice.org/imprint; target=_blankImpressum (Legal 
Info)/a
+a 
href=http://www.documentfoundation.org/privacy; target=_blankPrivacy 
Policy/a | a href=http://www.documentfoundation.org/imprint; 
target=_blankImpressum (Legal Info)/a
 | Copyright information: The source code of 
LibreOffice is licensed under the GNU Lesser General Public License (a 
href=http://www.libreoffice.org/download/license/; 
target=_blankLGPLv3/a). LibreOffice and The Document Foundation are 
registered trademarks of their corresponding registered owners or are in actual 
use as trademarks in one or more countries. Their respective logos and icons 
are also subject to international copyright laws. Use thereof is explained in 
our a href=http://wiki.documentfoundation.org/TradeMark_Policy; 
target=_blanktrademark policy/a.
 /p
 /div 
diff --git a/odk/docs/notsupported.html b/odk/docs/notsupported.html
index d9d6a13..b7376c1 100644
--- a/odk/docs/notsupported.html
+++ b/odk/docs/notsupported.html
@@ -68,7 +68,7 @@
 nbsp;
 /p
 p
-a href=http://www.libreoffice.org/privacy; 
target=_blankPrivacy Policy/a | a 
href=http://www.libreoffice.org/imprint; target=_blankImpressum (Legal 
Info)/a
+a 
href=http://www.documentfoundation.org/privacy; target=_blankPrivacy 
Policy/a | a href=http://www.documentfoundation.org/imprint; 
target=_blankImpressum (Legal Info)/a
 | Copyright

[Libreoffice-commits] .: basctl/inc basctl/source

[Andras Timar]

 basctl/inc/basidesh.hrc |3 +++
 basctl/source/basicide/baside2.cxx  |   31 +--
 basctl/source/basicide/baside2.hxx  |6 ++
 basctl/source/basicide/baside2b.cxx |   23 ++-
 basctl/source/basicide/basides1.cxx |   30 +++---
 basctl/source/basicide/basidesh.cxx |2 ++
 basctl/source/basicide/bastypes.cxx |8 +++-
 basctl/source/basicide/objdlg.cxx   |9 -
 basctl/source/basicide/objdlg.hxx   |4 ++--
 basctl/source/basicide/objdlg.src   |3 ++-
 basctl/source/inc/basidesh.hxx  |2 ++
 basctl/source/inc/bastypes.hxx  |1 +
 12 files changed, 103 insertions(+), 19 deletions(-)

New commits:
commit 0e8eb19a53338c83dab7fe19e2f23bcaecd52077
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date:   Sun Mar 11 21:40:02 2012 +0100

Object Catalog pane in Basic IDE

Object Catalog was a floating window. It has been converted to a fixed
pane on the right hand side of the editor window. While it is a
BasicDockingWindow, at the moment it is not possible to undock, move,
or resize it. Also, the Object Catalog toolbar button does not show
the visibility status of the pane, ideally it should look pressed, when
the Object Catalog pane is visible. Another missing feature is that
the Object Catalog pane cannot be switched on together with the
dialog editor.

diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index 9e5ccb2..dc1b432 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -31,6 +31,9 @@
 #include svx/svxids.hrc
 #endif
 
+// Width of Object Catalog pane in pixels
+#define OBJCAT_PANE_WIDTH 240
+
 // Resource-ID's...
 #ifndef _SVX_NOIDERESIDS
 
diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 7adc866..ce6a140 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -33,6 +33,7 @@
 #include brkdlg.hxx
 #include iderdll.hxx
 #include iderdll2.hxx
+#include objdlg.hxx
 
 #include baside2.hrc
 
@@ -1388,6 +1389,11 @@ void ModulWindow::SetLineNumberDisplay(bool b)
 aXEditorWindow.SetLineNumberDisplay(b);
 }
 
+void ModulWindow::SetObjectCatalogDisplay(bool b)
+{
+aXEditorWindow.SetObjectCatalogDisplay(b);
+}
+
 sal_Bool ModulWindow::IsPasteAllowed()
 {
 sal_Bool bPaste = sal_False;
@@ -1420,6 +1426,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
 aHSplitter( this, WinBits( WB_HSCROLL ) ),
 aWatchWindow( this ),
 aStackWindow( this ),
+aObjectCatalog( this ),
 bVSplitted(sal_False),
 bHSplitted(sal_False),
 m_pModulWindow(0),
@@ -1434,6 +1441,7 @@ ModulWindowLayout::ModulWindowLayout( Window* pParent ) :
 
 aWatchWindow.Show();
 aStackWindow.Show();
+aObjectCatalog.Show();
 
 Color aColor(GetSettings().GetStyleSettings().GetFieldTextColor());
 m_aSyntaxColors[TT_UNKNOWN] = aColor;
@@ -1506,12 +1514,13 @@ void ModulWindowLayout::ArrangeWindows()
 nVSplitPos = ( nVSplitPos  nMinPos ) ? 0 : ( aSz.Height() - 
SPLIT_HEIGHT );
 
 Size aXEWSz;
-aXEWSz.Width() = aSz.Width();
+aXEWSz.Width() = aSz.Width() - OBJCAT_PANE_WIDTH;
+
 aXEWSz.Height() = nVSplitPos + 1;
 if ( m_pModulWindow )
 {
 DBG_CHKOBJ( m_pModulWindow, ModulWindow, 0 );
-m_pModulWindow-SetPosSizePixel( Point( 0, 0 ), aXEWSz );
+m_pModulWindow-SetPosSizePixel( Point( OBJCAT_PANE_WIDTH, 0 ), aXEWSz 
);
 }
 
 aVSplitter.SetDragRectPixel( Rectangle( Point( 0, 0 ), Size( aSz.Width(), 
aSz.Height() ) ) );
@@ -1536,6 +1545,11 @@ void ModulWindowLayout::ArrangeWindows()
 if ( !aStackWindow.IsFloatingMode() )
 aStackWindow.SetPosSizePixel( aSWPos, aSWSz );
 
+Size aOCSz( OBJCAT_PANE_WIDTH, aSz.Height() - aSWSz.Height() - 3 );
+Point aOCPos( 0, 0 );
+if ( !aObjectCatalog.IsFloatingMode() )
+aObjectCatalog.SetPosSizePixel( aOCPos, aOCSz );
+
 if ( aStackWindow.IsFloatingMode()  aWatchWindow.IsFloatingMode() )
 aHSplitter.Hide();
 else
@@ -1592,6 +1606,15 @@ sal_Bool ModulWindowLayout::IsToBeDocked( DockingWindow* 
pDockingWindow, const P
 return sal_True;
 }
 }
+if ( pDockingWindow == aObjectCatalog )
+{
+if ( ( aPosInMe.Y()  nVSplitPos )  ( aPosInMe.X()  nHSplitPos 
) )
+{
+rRect.SetSize( Size( aSz.Width() - nHSplitPos, aSz.Height() - 
nVSplitPos ) );
+rRect.SetPos( OutputToScreenPixel( Point( nHSplitPos, 
nVSplitPos ) ) );
+return sal_True;
+}
+}
 }
 return sal_False;
 }
@@ -1606,6 +1629,10 @@ void ModulWindowLayout::DockaWindow( DockingWindow* 
pDockingWindow )
 {
 ArrangeWindows();
 }
+else if ( pDockingWindow == aObjectCatalog )
+{
+ArrangeWindows();
+}
 #if OSL_DEBUG_LEVEL  0
 else
 OSL_FAIL( Wer will sich denn hier 

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source

[Andras Timar]

 scp2/source/onlineupdate/file_onlineupdate.scp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5ad30d4a01c27a4660b99de0c59a75c92792d1f0
Author: Andras Timar ati...@suse.com
Date:   Thu Mar 8 13:50:28 2012 +0100

fix library name

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

diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp 
b/scp2/source/onlineupdate/file_onlineupdate.scp
index 8cca574..abfb76c 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -29,9 +29,9 @@
 
 File gid_File_Lib_Updchk
 BIN_FILE_BODY;
-   Styles = (PACKED);
-   Dir = gid_Brand_Dir_Program;
-   Name = updchk.uno.dll;
+Styles = (PACKED);
+Dir = gid_Brand_Dir_Program;
+Name = SPECIAL_COMPONENT_LIB_NAME(updchk.uno);
 ComponentCondition=ISCHECKFORPRODUCTUPDATES=1;
 End 
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/qa sw/source

[Andras Timar]

 sw/qa/core/data/ww8/pass/fdo40686-1.doc |binary
 sw/source/filter/ww8/ww8par6.cxx|   15 +--
 2 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit dbf4c479ae43cdd6ee2f8b9b42452b1a8c46765b
Author: Caolán McNamara caol...@redhat.com
Date:   Thu Mar 8 13:00:45 2012 +

Resolves: fdo#40686 dyaLinePitch only valid between [1-31680]

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

diff --git a/sw/qa/core/data/ww8/pass/fdo40686-1.doc 
b/sw/qa/core/data/ww8/pass/fdo40686-1.doc
new file mode 100644
index 000..bb0fd59
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/fdo40686-1.doc differ
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 845a381..2f7a956 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -270,14 +270,11 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt rFmt, 
const wwSection rSection)
 if (eType != GRID_NONE)
 rDoc.set(IDocumentSettingAccess::ADD_EXT_LEADING, false);
 
-   //force to set document as standard page mode
+//force to set document as standard page mode
 sal_Bool bSquaredMode = sal_False;
 rDoc.SetDefaultPageMode( bSquaredMode );
 aGrid.SetSquaredMode( bSquaredMode );
 
-//sep.dyaLinePitch
-sal_Int32 nLinePitch = rSection.maSep.dyaLinePitch;
-
 //Get the size of word's default styles font
 sal_uInt32 nCharWidth=240;
 for (sal_uInt16 nI = 0; nI  pStyles-GetCount(); ++nI)
@@ -306,8 +303,14 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrmFmt rFmt, 
const wwSection rSection)
 }
 
 aGrid.SetBaseWidth( writer_castsal_uInt16(nCharWidth));
-aGrid.SetLines(writer_castsal_uInt16(nTextareaHeight/nLinePitch));
-aGrid.SetBaseHeight(writer_castsal_uInt16(nLinePitch));
+
+//sep.dyaLinePitch
+sal_Int32 nLinePitch = rSection.maSep.dyaLinePitch;
+if (nLinePitch = 1  nLinePitch = 31680)
+{
+aGrid.SetLines(writer_castsal_uInt16(nTextareaHeight/nLinePitch));
+aGrid.SetBaseHeight(writer_castsal_uInt16(nLinePitch));
+}
 
 sal_Int32 nRubyHeight = 0;
 aGrid.SetRubyHeight(writer_castsal_uInt16(nRubyHeight));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source solenv/inc

[Andras Timar]

 scp2/source/ooo/module_helppack.ulf |   10 --
 scp2/source/ooo/module_langpack.ulf |   10 --
 solenv/inc/langlist.mk  |1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 05bc9c87a896f58de27accf5a06c04b22a2a74e3
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 6 11:57:45 2012 +0100

Add Bengali (India) UI translation

diff --git a/scp2/source/ooo/module_helppack.ulf 
b/scp2/source/ooo/module_helppack.ulf
index 18ac86e..269054e 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -254,10 +254,16 @@ en-US = Northern Sotho
 en-US = Installs Northern Sotho help in %PRODUCTNAME %PRODUCTVERSION
 
 [STR_NAME_MODULE_HELPPACK_BN]
-en-US = Bengali
+en-US = Bengali (Bangladesh)
 
 [STR_DESC_MODULE_HELPPACK_BN]
-en-US = Installs Bengali help in %PRODUCTNAME %PRODUCTVERSION
+en-US = Installs Bengali (Bangladesh) help in %PRODUCTNAME %PRODUCTVERSION
+
+[STR_NAME_MODULE_HELPPACK_BN_IN]
+en-US = Bengali (India)
+
+[STR_DESC_MODULE_HELPPACK_BN_IN]
+en-US = Installs Bengali (India) help in %PRODUCTNAME %PRODUCTVERSION
 
 [STR_NAME_MODULE_HELPPACK_OR]
 en-US = Oriya
diff --git a/scp2/source/ooo/module_langpack.ulf 
b/scp2/source/ooo/module_langpack.ulf
index 086033f..fa598e9 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -260,10 +260,16 @@ en-US = Northern Sotho
 en-US = Installs the Northern Sotho user interface
 
 [STR_NAME_MODULE_LANGPACK_BN]
-en-US = Bengali
+en-US = Bengali (Bangladesh)
 
 [STR_DESC_MODULE_LANGPACK_BN]
-en-US = Installs the Bengali user interface
+en-US = Installs the Bengali (Bangladesh) user interface
+
+[STR_NAME_MODULE_LANGPACK_BN_IN]
+en-US = Bengali (India)
+
+[STR_DESC_MODULE_LANGPACK_BN]
+en-US = Installs the Bengali (India) user interface
 
 [STR_NAME_MODULE_LANGPACK_OR]
 en-US = Oriya
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 67515a8..5ba2dc8 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -34,6 +34,7 @@ ast \
 be \
 bg \
 bn \
+bn-IN \
 bo \
 br \
 brx \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

[Andras Timar]

 scp2/source/onlineupdate/file_onlineupdate.scp |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 5ce699f0c82d5bfd629c22be0747bbe3b851a9fd
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 6 16:10:25 2012 +0100

fdo#46508 use ISCHECKFORPRODUCTUPDATES property for online update

ISCHECKFORPRODUCTUPDATES is a de-facto standard for enabling or
disabling Online Update feature. We had this property but it was
unused for a long time. Now LibreOffice can be installed with
msiexec /i LibOversion.msi ISCHECKFORPRODUCTUPDATES=0 in order
to disable Online Update feature.

diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp 
b/scp2/source/onlineupdate/file_onlineupdate.scp
index 526e6eb..7c60bcc 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -27,13 +27,20 @@
 
 #include macros.inc
 
-SPECIAL_LIB_FILE( gid_File_Lib_Updchk , updchk )
+File gid_File_Lib_Updchk
+BIN_FILE_BODY;
+Styles = (PACKED);
+Dir = gid_Brand_Dir_Program;
+Name = updchk.dll;
+ComponentCondition=ISCHECKFORPRODUCTUPDATES=1;
+End
 
 File gid_File_Share_Registry_Onlineupdate_Xcd
 TXT_FILE_BODY;
 Styles = (PACKED);
 Dir = gid_Brand_Dir_Share_Registry;
 Name = onlineupdate.xcd;
+ComponentCondition=ISCHECKFORPRODUCTUPDATES=1;
 End
 
 #if defined LINUX || defined SOLARIS
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/util

[Andras Timar]

 instsetoo_native/util/openoffice.lst |4 
 1 file changed, 4 deletions(-)

New commits:
commit d4b824868f938e40fc2af72990567667cbccbf5c
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 6 21:10:15 2012 +0100

remove unused SETSTATICPATH variable

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 4dcde68..188141e 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -74,7 +74,6 @@ LibreOffice
 GLOBALFILEGID gid_File_Lib_Vcl
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
-SETSTATICPATH 1
 OOODOWNLOADNAME 1
 XPDINSTALLER 0
 BETAUPGRADECODE
@@ -137,7 +136,6 @@ LibreOffice_Dev
 GLOBALFILEGID gid_File_Lib_Vcl
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
-SETSTATICPATH 1
 OOODOWNLOADNAME 1
 XPDINSTALLER 0
 BETAUPGRADECODE
@@ -181,7 +179,6 @@ URE
 LONG_PRODUCTEXTENSION
 SHORT_PRODUCTEXTENSION alpha0
 LICENSENAME LGPL
-SETSTATICPATH 1
 NOVERSIONINDIRNAME 1
 PCPFILENAME ure.pcp
 GLOBALFILEGID gid_File_Dl_Cppu
@@ -415,7 +412,6 @@ OxygenOffice
 GLOBALFILEGID gid_File_Lib_Vcl
 GLOBALPATCHFILEGID gid_File_Txt_Patchfiles
 SPELLCHECKERFILE spellchecker_selection.txt
-SETSTATICPATH 1
 OOODOWNLOADNAME 1
 XPDINSTALLER 0
 BETAUPGRADECODE
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/util solenv/bin

[Andras Timar]

 instsetoo_native/util/openoffice.lst  |8 --
 solenv/bin/modules/installer/windows/msiglobal.pm |   29 +-
 2 files changed, 13 insertions(+), 24 deletions(-)

New commits:
commit 07cf4a4a21b4f8f9325e7a7243fba6295ec42a54
Author: Andras Timar ati...@suse.com
Date:   Tue Mar 6 21:17:00 2012 +0100

we always use relative paths in ddf files

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 188141e..6856a67 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -82,7 +82,6 @@ LibreOffice
 USE_FILEVERSION 1
 LIBRARYVERSION 9.4.0
 PATCHCODEFILE ooo_patchcodes.txt
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -146,7 +145,6 @@ LibreOffice_Dev
 PATCHCODEFILE ooodev_patchcodes.txt
 CODEFILENAME codes_ooodev.txt
 LOCALUSERDIR $ORIGIN/..
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -183,7 +181,6 @@ URE
 PCPFILENAME ure.pcp
 GLOBALFILEGID gid_File_Dl_Cppu
 DONTUSESTARTMENUFOLDER 1
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -227,7 +224,6 @@ LibreOffice_SDK
 NOSHORTDIRECTORYNAMES 1
 CHANGETARGETDIR 1
 DONTUSESTARTMENUFOLDER 1
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -275,7 +271,6 @@ LibreOffice_Dev_SDK
 NOSHORTDIRECTORYNAMES 1
 CHANGETARGETDIR 1
 DONTUSESTARTMENUFOLDER 1
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -317,7 +312,6 @@ LibreOffice_Test
 NOSHORTDIRECTORYNAMES 1
 CHANGETARGETDIR 1
 DONTUSESTARTMENUFOLDER 1
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -365,7 +359,6 @@ LibreOffice_Dev_Test
 NOSHORTDIRECTORYNAMES 1
 CHANGETARGETDIR 1
 DONTUSESTARTMENUFOLDER 1
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
@@ -424,7 +417,6 @@ OxygenOffice
 PROGRESSSIZE 430,5
 PROGRESSPOSITION 5,230
 PROGRESSFRAMECOLOR 207,208,211
-RELATIVE_PATHES_IN_DDF 1
 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
 STARTCENTER_INFO_URL http://www.libreoffice.org/
 STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 6a9d68b..f1d1e3d 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -202,7 +202,7 @@ sub generate_cab_file_list
 if ( $styles =~ /\bDONT_PACK\b/ ) { $doinclude = 0; }
 
 # to avoid lines with more than 256 characters, it can be useful 
to use relative paths
-if ( $allvariables-{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath = 
make_relative_ddf_path($sourcepath); }
+$sourcepath = make_relative_ddf_path($sourcepath);
 
 # all files with the same cabinetfile have increasing 
sequencenumbers
 
@@ -224,7 +224,7 @@ sub generate_cab_file_list
 $sourcepath =  $nextfile-{'sourcepath'};
 if ( $^O =~ /cygwin/i ) { $sourcepath = 
$nextfile-{'cyg_sourcepath'}; }
 # to avoid lines with more than 256 characters, it can be 
useful to use relative paths
-if ( $allvariables-{'RELATIVE_PATHES_IN_DDF'} ) { $sourcepath 
= make_relative_ddf_path($sourcepath); }
+$sourcepath = make_relative_ddf_path($sourcepath);
 $uniquename

[Libreoffice-commits] .: extensions/source

[Andras Timar]

 extensions/source/activex/idl/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 717aff55d2d2fa021a6ee479c93ce12b973cc3da
Author: Andras Timar ati...@suse.com
Date:   Sun Mar 4 12:06:53 2012 +0100

fdo#46847 typo in midl command line

diff --git a/extensions/source/activex/idl/Makefile 
b/extensions/source/activex/idl/Makefile
index 82e4f50..742a822 100644
--- a/extensions/source/activex/idl/Makefile
+++ b/extensions/source/activex/idl/Makefile
@@ -37,7 +37,7 @@ so_activex.tlb :
-iid so_activex_i.c \
-dlldata so_activex_dll.c \
-proxy so_activex_p.c \
-   -0icf \
+   -Oicf \
$(INCLUDE) \
$(SRCDIR)/extensions/source/activex/so_activex.idl
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: extensions/source

[Andras Timar]

 extensions/source/activex/idl/Makefile |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit cbeeae7f81555409cafb677a2292b8be40c449e6
Author: Andras Timar ati...@suse.com
Date:   Sun Mar 4 14:53:19 2012 +0100

fdo#46847 use windows style path for midl.exe

diff --git a/extensions/source/activex/idl/Makefile 
b/extensions/source/activex/idl/Makefile
index 742a822..62b9150 100644
--- a/extensions/source/activex/idl/Makefile
+++ b/extensions/source/activex/idl/Makefile
@@ -30,6 +30,9 @@ include $(GBUILDDIR)/gbuild_simple.mk
 # XXX: I presume that the $(COM)==GCC case in the original
 # extensions/source/activex/msidl/makefile.mk was for the
 # use-mingw-on-windows case and thus is not interesting for us.
+ifeq ($(OS_FOR_BUILD),WNT)
+override SRCDIR := $(shell cygpath -m $(SRCDIR))
+endif
 so_activex.tlb :
midl.exe \
-tlb $@ \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/gbuild

[Andras Timar]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 48666b7d6006618d46e2a7686391440830f47ef1
Author: Andras Timar ati...@suse.com
Date:   Fri Mar 2 14:35:43 2012 +0100

Cygwin uses internal Python which does not understand Cygwin paths

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk 
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 6402b42..39853d9 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -700,6 +700,6 @@ gb_WinResTarget__command_dep =
 endif
 
 # Python
-gb_PYTHON_PRECOMMAND :=  PATH=$${PATH}:$(OUTDIR)/bin 
PYTHONHOME=$(OUTDIR)/lib/python 
PYTHONPATH=$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload
+gb_PYTHON_PRECOMMAND :=  PATH=$${PATH}:$(shell cygpath -m $(OUTDIR)/bin) 
PYTHONHOME=$(shell cygpath -m $(OUTDIR))/lib/python PYTHONPATH=$(shell 
cygpath -m $(OUTDIR))/lib/python;$(shell cygpath -m 
$(OUTDIR))/lib/python/lib-dynload
 
 # vim: set noet sw=4:
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: officecfg/registry scp2/source setup_native/source solenv/inc

[Andras Timar]

 officecfg/registry/data/org/openoffice/VCL.xcu |   23 +++
 scp2/source/ooo/module_langpack.ulf|6 ++
 setup_native/source/win32/msi-encodinglist.txt |1 +
 solenv/inc/langlist.mk |1 +
 4 files changed, 31 insertions(+)

New commits:
commit bd2b353f66e4bb2e76c115eb8028c1d0ba59a468
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 29 15:58:04 2012 +0100

add Amharic (am) UI translation

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 265b4ec..e01d207 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -136,6 +136,29 @@
   /prop
 /node
 
+node oor:name=am oor:op=replace
+ prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
+valueNyala;Abyssinica SIL/value
+ /prop
+  prop oor:name=SANS_UNICODE oor:type=xs:string oor:op=replace
+valueNyala;Abyssinica SIL/value
+  /prop
+ prop oor:name=CTL_DISPLAY oor:type=xs:string oor:op=replace
+valueNyala;Abyssinica SIL/value
+ /prop
+ prop oor:name=CTL_HEADING oor:type=xs:string oor:op=replace
+valueNyala;Abyssinica SIL/value
+ /prop
+ prop oor:name=CTL_PRESENTATION oor:type=xs:string oor:op=replace
+valueNyala;Abyssinica SIL/value
+ /prop
+ prop oor:name=CTL_SPREADSHEET oor:type=xs:string oor:op=replace
+valueNyala;Abyssinica SIL/value
+ /prop
+ prop oor:name=CTL_TEXT oor:type=xs:string oor:op=replace
+valueNyala;Abyssinica SIL/value
+ /prop
+/node
 node oor:name=ar oor:op=replace
  prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueTahoma;Traditional Arabic;Simplified Arabic;Lucidasans;Lucida 
Sans;Supplement;Arial Unicode MS;Lucida Sans Unicode;clearlyU;Interface 
User;Geneva;Dialog;Albany AMT;Albany;Lucida;Arial;Nimbus Sans 
L;Helvetica;Helmet;Interface System;Sans Serif/value
diff --git a/scp2/source/ooo/module_langpack.ulf 
b/scp2/source/ooo/module_langpack.ulf
index 4fd7314..086033f 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -673,6 +673,12 @@ en-US = Luxembourgish
 [STR_DESC_MODULE_LANGPACK_LB]
 en-US = Installs the Luxembourgish user interface
 
+[STR_NAME_MODULE_LANGPACK_AM]
+en-US = Amharic
+
+[STR_DESC_MODULE_LANGPACK_AM]
+en-US = Installs the Amharic user interface
+
 [STR_NAME_MODULE_LANGPACK_QTZ]
 en-US = KeyID
 
diff --git a/setup_native/source/win32/msi-encodinglist.txt 
b/setup_native/source/win32/msi-encodinglist.txt
index 936adb4..1fd3cb9 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -1,6 +1,7 @@
 # Syntax: language ANSI-Codepage LCID
 # comment lines begin with hash
 af1252  1078   # Afrikaans
+am   0  1118   # Amharic
 ar1256  1025
 ar-SA 1256  1025
 as   0  1101   # Assamese
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index 42c1172..d61eef7 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -27,6 +27,7 @@
 
 # Complete list of all supported localizations (ISO codes)
 completelangiso=af \
+am \
 ar \
 as \
 ast \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: solenv/inc

[Andras Timar]

 solenv/inc/langlist.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3cc7cbeb0efab138696bb9901b33648025e29a45
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 29 16:47:35 2012 +0100

remove ky-CN, apparently they did not start translation

diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index d61eef7..67515a8 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -77,7 +77,6 @@ ko \
 kok \
 ks \
 ku \
-ky-CN \
 lb \
 lo \
 lt \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/scripts

[Andras Timar]

 l10ntools/scripts/propex |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cb578c77e23a409f434022dd175c5bd702877ffa
Author: Andras Timar ati...@suse.com
Date:   Tue Feb 28 11:03:02 2012 +0100

fix behaviour of propex tool on Windows

diff --git a/l10ntools/scripts/propex b/l10ntools/scripts/propex
index 6a402a2..35dcb25 100755
--- a/l10ntools/scripts/propex
+++ b/l10ntools/scripts/propex
@@ -41,7 +41,8 @@ getopts(ep:r:i:o:l:, \%options);
 
 unless ( $options{i} =~ m/en_US/ ) {exit 0;}
 
-my ($unsued1, $dir, $unused2) = File::Basename::fileparse($options{i});
+$options{i} =~ s|\\|/|g; # fix path on Windows, Perl expects / separator
+my ($unused1, $dir, $unused2) = File::Basename::fileparse($options{i});
 my $file = substr ( Cwd::abs_path($options{i}), length(Cwd::abs_path($dir . 
$options{r})) + 1 );
 $file =~ s|/|\\|g;
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: filter/source

[Andras Timar]

 filter/source/pdf/impdialog.src |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit e54773aa64af28795155aa55b3179141ca904f12
Author: Andras Timar ati...@suse.com
Date:   Tue Feb 28 14:06:16 2012 +0100

fdo#45023 UI fix on PDF export dialog

diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src
index 006fa3a..dd8d50b 100644
--- a/filter/source/pdf/impdialog.src
+++ b/filter/source/pdf/impdialog.src
@@ -177,8 +177,9 @@ TabPage  RID_PDF_TAB_GENER
 };
 FixedText FT_ADDSTREAMDESCRIPTION
 {
-Pos = MAP_APPFONT( 206 , 27 ) ;
-Size = MAP_APPFONT( 140, 8 ) ;
+Pos = MAP_APPFONT( 206 , 23 ) ;
+Size = MAP_APPFONT( 140, 16 ) ;
+Wordbreak = TRUE ;
 Text[ en-US ] = Makes this PDF easily editable in %PRODUCTNAME ;
 };
 CheckBox CB_PDFA_1B_SELECT
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source

[Andras Timar]

 l10ntools/source/helpmerge.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 249dea425a1b8660197af53ab8a56268fddf8ce6
Author: Andras Timar ati...@suse.com
Date:   Tue Feb 28 15:11:22 2012 +0100

Prevent crash of helpex.exe

diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 4cbf8d5..a682bfb 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -244,7 +244,6 @@ bool HelpParser::Merge(
 //TODO: explicit BOM handling?
 
 XMLFile* xmlfile = aParser.Execute( sXmlFile, new XMLFile( 
rtl::OUString('0') ) );
-xmlfile-Extract();
 
 if( xmlfile == NULL)
 {
@@ -252,6 +251,7 @@ bool HelpParser::Merge(
 exit(-1);
 }
 
+xmlfile-Extract();
 
 rtl::OString sCur;
 for( unsigned int n = 0; n  aLanguages.size(); n++ ){
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Andras Timar]

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

New commits:
commit 8e750a2d9c653e0693738c847fe2ee2a8ab04052
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Fri Feb 24 16:42:35 2012 +0100

Reduced loadtime of autocorrect tables

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 93a370f..cdd56d0 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1213,7 +1213,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool 
bFromReset,
 {
 SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
 SvxAutocorrWordList* pWordList = 
pAutoCorrect-LoadAutocorrWordList(eLang);
-
+aReplaceTLB.SetUpdateMode(sal_False);
 for(sal_uInt16 i = 0; i  pWordList-Count(); i++)
 {
 SvxAutocorrWordPtr pWordPtr = pWordList-GetObject(i);
@@ -1234,7 +1234,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool 
bFromReset,
 }
 aNewReplacePB.Enable(sal_False);
 aDeleteReplacePB.Enable(sal_False);
-
+aReplaceTLB.SetUpdateMode(sal_True);
 }
 
 SfxViewShell* pViewShell = SfxViewShell::Current();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source

[Andras Timar]

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

New commits:
commit 3a90b7fea7de8860dfdb92925df39dac3d0ed4fc
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date:   Fri Feb 24 16:42:35 2012 +0100

Reduced loadtime of autocorrect tables

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

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 147a18f..764203a 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1225,7 +1225,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool 
bFromReset,
 {
 SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
 SvxAutocorrWordList* pWordList = 
pAutoCorrect-LoadAutocorrWordList(eLang);
-
+aReplaceTLB.SetUpdateMode(sal_False);
 for(sal_uInt16 i = 0; i  pWordList-Count(); i++)
 {
 SvxAutocorrWordPtr pWordPtr = pWordList-GetObject(i);
@@ -1248,7 +1248,7 @@ void OfaAutocorrReplacePage::RefillReplaceBox(sal_Bool 
bFromReset,
 }
 aNewReplacePB.Enable(sal_False);
 aDeleteReplacePB.Enable(sal_False);
-
+aReplaceTLB.SetUpdateMode(sal_True);
 }
 
 SfxViewShell* pViewShell = SfxViewShell::Current();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: instsetoo_native/inc_openoffice

[Andras Timar]

 instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a4ae955534ccc449ddf55fe1b5e5a25065af2ecd
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 24 11:38:17 2012 +0100

fdo#44717 More helpful text when installer detects a running soffice.bin

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf 
b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
index 110925c..b80d173 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
@@ -8,4 +8,4 @@ en-US  = The same version of this product is already 
installed.
 en-US = An older version of [ProductName] was found. To install a newer 
version, the older version needs to be removed first.
 
 [OOO_CUSTOMACTION_4]
-en-US = Please exit [DEFINEDPRODUCT] [DEFINEDVERSION] and the 
[DEFINEDPRODUCT] [DEFINEDVERSION] Quickstarter before you continue. If you are 
using a multi-user system, also make sure that no other user has 
[DEFINEDPRODUCT] [DEFINEDVERSION] open.
+en-US = Setup detected a running soffice.bin process. Before you restart the 
installation, please exit the application that owns soffice.bin. It can be 
LibreOffice, OpenOffice.org, Lotus Symphony, etc. Also check for the running 
Quickstarter on Windows taskbar. If you are using a multi-user system, also 
make sure that no other user has this application open.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

[Andras Timar]

 scp2/source/ooo/common_brand.scp |2 +-
 scp2/source/ooo/registryitem_ooo.scp |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 06dd0fda38f07a74ba8469542ed4afe93b47ee9c
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 24 11:46:39 2012 +0100

fdo#46377 BASISINSTALLLOCATION = INSTALLLOCATION

diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 6ded2c4..69c0a71 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1396,7 +1396,7 @@ ProfileItem gid_Brand_Profileitem_Setup_Basisinstall
 Section = Bootstrap;
 Order = 4;
 Key = BASISINSTALLLOCATION;
-Value = [INSTALLLOCATION]Basis\\;
+Value = [INSTALLLOCATION];
 Inifiletablekey = BasisInstallLocation;
 Inifiletableaction = 1;
 Styles = (INIFILETABLE);
diff --git a/scp2/source/ooo/registryitem_ooo.scp 
b/scp2/source/ooo/registryitem_ooo.scp
index 5bc40d6..803f979 100644
--- a/scp2/source/ooo/registryitem_ooo.scp
+++ b/scp2/source/ooo/registryitem_ooo.scp
@@ -334,7 +334,7 @@ RegistryItem 
gid_Regitem_Software_Manufacturer_Productname_Productversion_Produc
Subkey = 
Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -343,7 +343,7 @@ RegistryItem 
gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgrad
Subkey = 
Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
 End
 
@@ -352,7 +352,7 @@ RegistryItem 
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
 Subkey = Software\LibreOffice\${REGISTRYLAYERNAME}\Basis\%PRODUCTVERSION;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_PRODUCTVERSION);
 End
 
@@ -361,7 +361,7 @@ RegistryItem 
gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstal
 Subkey = 
Software\LibreOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION;
ModuleID = gid_Module_Root;
Name = BASISINSTALLLOCATION;
-   Value = [INSTALLLOCATION]Basis\\;
+   Value = [INSTALLLOCATION];
Styles = (ALWAYS_REQUIRED);
 End
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source solenv/inc

[Andras Timar]

 l10ntools/source/help/HelpLinker.cxx |2 +-
 solenv/inc/_tg_zip.mk|   30 ++
 solenv/inc/rules.mk  |2 +-
 solenv/inc/tg_help.mk|   16 +---
 solenv/inc/tg_zip.mk |3 +--
 5 files changed, 18 insertions(+), 35 deletions(-)

New commits:
commit 995b2f887bd75283d2d395d9430cd0472f7356ae
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 24 16:43:03 2012 +0100

more silent output of non-verbose help build

diff --git a/l10ntools/source/help/HelpLinker.cxx 
b/l10ntools/source/help/HelpLinker.cxx
index eea87d5..0103f43 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -702,7 +702,7 @@ void HelpLinker::link() throw( HelpProcessingException )
 fs::path fsAdditionalFileName( additionalFileName, fs::native );
 std::string aNativeStr = 
fsAdditionalFileName.native_file_string();
 const char* pStr = aNativeStr.c_str();
-std::cerr  pStr;
+HCDBG(std::cerr  pStr  std::endl);
 
 fs::path fsTargetName( indexDirParentName / additionalFileKey );
 
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index 2dfe467..0f04434 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -47,7 +47,6 @@ $(MISC)/$(TARGET).$(PWD:f).$(ZIP1TARGET).dpzz : $(ZIP1TARGETN)
 ZIP1HELPVAR=$(BIN)/$(ZIP1TARGET)
 
 $(ZIP1DEPFILE) :
-@echo #  $(MISC)/$(@:f)
 .IF $(ZIP1DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP1DIR)
 $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) 
$(foreach,j,$(ZIP1LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )})  $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
@@ -58,7 +57,7 @@ $(ZIP1DEPFILE) :
 
 
 $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
-@echo [ZIP] $(@:f)
+@echo [ building ZIP ] $(@:f)
 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ 
$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
 .IF $(ZIP1DIR) != 
 @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ 
$(@:db))}$(ZIP1EXT)
@@ -124,7 +123,6 @@ $(MISC)/$(TARGET).$(PWD:f).$(ZIP2TARGET).dpzz : 
$(ZIP2TARGETN)
 ZIP2HELPVAR=$(BIN)/$(ZIP2TARGET)
 
 $(ZIP2DEPFILE) :
-@echo #  $(MISC)/$(@:f)
 .IF $(ZIP2DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP2DIR)
 $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) 
$(foreach,j,$(ZIP2LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )})  $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
@@ -135,7 +133,7 @@ $(ZIP2DEPFILE) :
 
 
 $(ZIP2TARGETN) : delzip $(ZIP2DEPS)
-@echo [ZIP] $(@:f)
+@echo [ building ZIP ] $(@:f)
 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ 
$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
 .IF $(ZIP2DIR) != 
 @@-$(GNUCOPY) -p $@ $(ZIP2TMP).$(ZIP2TARGET){$(subst,$(ZIP2HELPVAR),_ 
$(@:db))}$(ZIP2EXT)
@@ -201,7 +199,6 @@ $(MISC)/$(TARGET).$(PWD:f).$(ZIP3TARGET).dpzz : 
$(ZIP3TARGETN)
 ZIP3HELPVAR=$(BIN)/$(ZIP3TARGET)
 
 $(ZIP3DEPFILE) :
-@echo #  $(MISC)/$(@:f)
 .IF $(ZIP3DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP3DIR)
 $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP3DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP3FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP3DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP3EXT)/)) 
$(foreach,j,$(ZIP3LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP3TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )})  $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
@@ -212,7 +209,7 @@ $(ZIP3DEPFILE) :
 
 
 $(ZIP3TARGETN) : delzip $(ZIP3DEPS)
-@echo [ZIP] $(@:f)
+@echo [ building ZIP ] $(@:f)
 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ 
$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
 .IF $(ZIP3DIR) != 
 @@-$(GNUCOPY) -p $@ $(ZIP3TMP).$(ZIP3TARGET){$(subst,$(ZIP3HELPVAR),_ 
$(@:db))}$(ZIP3EXT)
@@ -278,7 +275,6 @@ $(MISC)/$(TARGET).$(PWD:f).$(ZIP4TARGET).dpzz : 
$(ZIP4TARGETN)
 ZIP4HELPVAR=$(BIN)/$(ZIP4TARGET)
 
 $(ZIP4DEPFILE) :
-@echo #  $(MISC)/$(@:f)
 .IF $(ZIP4DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP4DIR)
 $(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP4DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP4FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP4DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP4EXT)/)) 
$(foreach,j,$(ZIP4LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP4TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )})  $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
@@ -289,7 +285,7 @@ $(ZIP4DEPFILE) :
 
 
 $(ZIP4TARGETN) : delzip $(ZIP4DEPS)
-@echo [ZIP] $(@:f)
+@echo [ building ZIP ] $(@:f)
 @@$(!eq,$?,$(?:s/delzip/zzz

[Libreoffice-commits] .: officecfg/registry

[Andras Timar]

 officecfg/registry/data/org/openoffice/VCL.xcu |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 1e343276ecb7e88482e0dd8b2a1e170dbffbe8ba
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 24 23:16:31 2012 +0100

fdo#46571 add Gurmukhi MT font for pa-IN

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 4d8f11d..265b4ec 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -731,22 +731,22 @@
 /node
 node oor:name=pa-IN oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma/value
  /prop
   prop oor:name=CTL_DISPLAY oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
   prop oor:name=CTL_HEADING oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
   prop oor:name=CTL_PRESENTATION oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
   prop oor:name=CTL_SPREADSHEET oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
   prop oor:name=CTL_TEXT oor:op=replace oor:type=xs:string
-valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
+valueRaavi;Lohit Punjabi;Saab;Gurmukhi MT;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
 /node
 node oor:name=ta oor:op=replace
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/source

[Andras Timar]

 oox/source/xls/viewsettings.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit bd2145e740b61b69cda6456d483bcd62883e2fe3
Author: Noel Power noel.po...@novell.com
Date:   Wed Feb 22 15:08:21 2012 +

force imported xlsx active tab to be shown bnc#748198

weirdly even though a sheet/tab can be marked as hidden in workbook.xml, if 
that same tab/sheet is the active one then it *will* be shown

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

diff --git a/oox/source/xls/viewsettings.cxx b/oox/source/xls/viewsettings.cxx
index 1eb07c7..297b3dc 100644
--- a/oox/source/xls/viewsettings.cxx
+++ b/oox/source/xls/viewsettings.cxx
@@ -498,7 +498,13 @@ void SheetViewSettings::finalizeImport()
 
 // sheet selected (active sheet must be selected)
 bool bSelected = xModel-mbSelected || (getSheetIndex() == 
getViewSettings().getActiveCalcSheet());
-
+if ( bSelected )
+{
+// active tab/sheet cannot be hidden
+// always force it to be displayed
+PropertySet aPropSet( getSheet() );
+aPropSet.setProperty( PROP_IsVisible, sal_True );
+}
 // visible area and current cursor position (selection not supported via 
API)
 CellAddress aFirstPos = xModel-maFirstPos;
 const PaneSelectionModel* pPaneSel = xModel-getActiveSelection();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source

[Andras Timar]

 l10ntools/source/helpex.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit aee538eb752325846966eb440e424126e00531af
Author: Andras Timar ati...@suse.com
Date:   Thu Feb 23 12:36:06 2012 +0100

do not print .\n to console

diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx
index d7cf212..cad9c55 100644
--- a/l10ntools/source/helpex.cxx
+++ b/l10ntools/source/helpex.cxx
@@ -242,7 +242,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) {
 for( vectorrtl::OString::iterator pos = filelist.begin() ; pos 
!= filelist.end() ; ++pos )
 {
 sHelpFile = *pos;
-std::cout  .\n;
 
 HelpParser aParser( sHelpFile , bUTF8 , true );
 hasNoError = aParser.Merge( sSDFFile , sOutputFileX , 
sOutputFileY , true , aLanguages , aMergeDataFile , bCreateDir );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: readlicense_oo/docs

[Andras Timar]

 readlicense_oo/docs/readme/readme.xrm |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5f34354fae4675d21be83261de8e82a5f8da2f09
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 22 13:54:13 2012 +0100

fix mailing list addresses

diff --git a/readlicense_oo/docs/readme/readme.xrm 
b/readlicense_oo/docs/readme/readme.xrm
index e4fd3ab..5280b49 100755
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -248,11 +248,11 @@
/li
 
li
-   p id=subscribelist2 
xml:lang=en-USMain user list: us...@libreoffice.org *easy way to lurk on 
discussions* (heavy traffic)/p
+   p id=subscribelist2 
xml:lang=en-USMain user list: us...@global.libreoffice.org *easy way to lurk 
on discussions* (heavy traffic)/p
/li
 
li
-   p id=subscribelist3 
xml:lang=en-USMarketing project: market...@libreoffice.org *beyond 
development* (getting heavy)/p
+   p id=subscribelist3 
xml:lang=en-USMarketing project: market...@global.libreoffice.org *beyond 
development* (getting heavy)/p
/li
 
li
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dictionaries/en dictionaries/hu_HU dictionaries/ru_RU

[Andras Timar]

 dictionaries/en/makefile.mk  |   19 ++-
 dictionaries/hu_HU/makefile.mk   |   21 -
 dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties |   15 ---
 dictionaries/ru_RU/makefile.mk   |   20 ++--
 4 files changed, 56 insertions(+), 19 deletions(-)

New commits:
commit 312a744c1c8a4afce0fe06a4423d97ebb883fc6d
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 20 10:01:50 2012 +0100

enable localization of Lightproof extensions

diff --git a/dictionaries/en/makefile.mk b/dictionaries/en/makefile.mk
index fc51ec1..ac9f7f6 100644
--- a/dictionaries/en/makefile.mk
+++ b/dictionaries/en/makefile.mk
@@ -88,7 +88,6 @@ COMPONENT_FILES= \
 $(EXTENSIONDIR)$/dialog/en_en_US.default \
 $(EXTENSIONDIR)$/dialog/en_en_US.properties \
 $(EXTENSIONDIR)$/dialog/en.xdl \
-$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu \
 $(EXTENSIONDIR)$/dialog/OptionsDialog.xcs
 
 COMPONENT_CONFIGDEST=.
@@ -103,6 +102,13 @@ PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
 COMPONENT_UNZIP_FILES= \
 $(EXTENSIONDIR)$/th_en_US_v2.idx
 
+.IF $(WITH_LANG) != 
+PROPERTIES_LOCALIZED:=$(MISC)/$(EXTENSIONNAME)_in/properties_localized
+COMPONENT_UNZIP_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu 
$(PROPERTIES_LOCALIZED)
+.ELSE
+COMPONENT_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu
+.ENDIF
+
 # add own targets to packing dependencies (need to be done before
 # packing the xtension
 # EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
@@ -123,4 +129,15 @@ $(EXTENSIONDIR)$/th_en_US_v2.idx : 
$(EXTENSIONDIR)$/th_en_US_v2.dat
 $(DESCRIPTION_SRC) : description.xml
 @@-$(MKDIRHIER) $(@:d)
 $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $ -o $@ -m $(LOCALIZESDF) -l all
+$(EXTENSIONDIR)/dialog/OptionsDialog.xcu : dialog/OptionsDialog.xcu
+$(COMMAND_ECHO)$(CFGEX) -p $(PRJNAME) \
+-i $ \
+-o $(EXTENSIONDIR)/dialog/OptionsDialog.xcu  \
+-m 
$(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/en/dialog/localize.sdf
 \
+-l all
+$(PROPERTIES_LOCALIZED) : $(EXTENSIONDIR)/dialog/en_en_US.properties
+$(COMMAND_ECHO)$(PERL) $(OUTDIR)/bin/propmerge \
+-i $ \
+-m 
$(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/en/dialog/localize.sdf
+@@-$(TOUCH) $(PROPERTIES_LOCALIZED)
 .ENDIF
diff --git a/dictionaries/hu_HU/makefile.mk b/dictionaries/hu_HU/makefile.mk
index 67916e4..998f692 100644
--- a/dictionaries/hu_HU/makefile.mk
+++ b/dictionaries/hu_HU/makefile.mk
@@ -72,7 +72,6 @@ COMPONENT_FILES= \
 $(EXTENSIONDIR)$/dialog/hu_HU_en_US.properties \
 $(EXTENSIONDIR)$/dialog/hu_HU_hu_HU.properties \
 $(EXTENSIONDIR)$/dialog/hu_HU.xdl \
-$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu \
 $(EXTENSIONDIR)$/dialog/OptionsDialog.xcs \
 $(EXTENSIONDIR)$/README_lightproof_hu_HU.txt
 
@@ -88,6 +87,14 @@ PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
 COMPONENT_UNZIP_FILES= \
 $(EXTENSIONDIR)$/th_hu_HU_v2.idx
 
+.IF $(WITH_LANG) != 
+PROPERTIES_LOCALIZED:=$(MISC)/$(EXTENSIONNAME)_in/properties_localized
+COMPONENT_UNZIP_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu 
$(PROPERTIES_LOCALIZED)
+.ELSE
+COMPONENT_FILES+=$(EXTENSIONDIR)$/dialog/OptionsDialog.xcu
+.ENDIF
+
+
 # add own targets to packing dependencies (need to be done before
 # packing the xtension
 # EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
@@ -108,4 +115,16 @@ $(EXTENSIONDIR)$/th_hu_HU_v2.idx : 
$(EXTENSIONDIR)$/th_hu_HU_v2.dat
 $(DESCRIPTION_SRC) : description.xml
 @@-$(MKDIRHIER) $(@:d)
 $(COMMAND_ECHO)$(XRMEX) -p $(PRJNAME) -i $ -o $@ -m $(LOCALIZESDF) -l all
+$(EXTENSIONDIR)/dialog/OptionsDialog.xcu : dialog/OptionsDialog.xcu
+$(COMMAND_ECHO)$(CFGEX) -p $(PRJNAME) \
+-i $ \
+-o $(EXTENSIONDIR)/dialog/OptionsDialog.xcu  \
+-m 
$(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/hu_HU/dialog/localize.sdf
 \
+-l all
+$(PROPERTIES_LOCALIZED) : $(EXTENSIONDIR)/dialog/hu_HU_en_US.properties
+$(COMMAND_ECHO)$(PERL) $(OUTDIR)/bin/propmerge \
+-i $ \
+-m 
$(L10N_MODULE)/$(COMMON_OUTDIR)$(PROEXT)/misc/sdf/dictionaries/hu_HU/dialog/localize.sdf
+@@-rm $(EXTENSIONDIR)/dialog/hu_HU_hu.properties
+@@-$(TOUCH) $(PROPERTIES_LOCALIZED)
 .ENDIF
diff --git a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties 
b/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties
deleted file mode 100644
index d7df847..000
--- a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-abbreviation=\u0410\u0431\u0431\u0440\u0435\u0432\u0438\u0430\u0442\u0443\u0440\u044b
-grammar=\u0413\u0440\u0430\u043c\u043c\u0430\u0442\u0438\u043a\u0430
-hyphen=\u0414\u0435\u0444\u0438

[Libreoffice-commits] .: dictionaries/ar dictionaries/bg_BG dictionaries/ca dictionaries/cs_CZ dictionaries/da_DK dictionaries/de dictionaries/en dictionaries/fr_FR dictionaries/hu_HU dictionaries/it_

[Andras Timar]

 dictionaries/ar/makefile.mk|2 +-
 dictionaries/bg_BG/makefile.mk |2 +-
 dictionaries/ca/makefile.mk|2 +-
 dictionaries/cs_CZ/makefile.mk |2 +-
 dictionaries/da_DK/makefile.mk |2 +-
 dictionaries/de/makefile.mk|4 ++--
 dictionaries/en/makefile.mk|2 +-
 dictionaries/fr_FR/makefile.mk |2 +-
 dictionaries/hu_HU/makefile.mk |2 +-
 dictionaries/it_IT/makefile.mk |2 +-
 dictionaries/lv_LV/makefile.mk |2 +-
 dictionaries/ne_NP/makefile.mk |2 +-
 dictionaries/no/makefile.mk|4 ++--
 dictionaries/pl_PL/makefile.mk |2 +-
 dictionaries/pt_PT/makefile.mk |2 +-
 dictionaries/ro/makefile.mk|2 +-
 dictionaries/ru_RU/makefile.mk |2 +-
 dictionaries/sk_SK/makefile.mk |2 +-
 dictionaries/sl_SI/makefile.mk |2 +-
 dictionaries/sv_SE/makefile.mk |2 +-
 dictionaries/uk_UA/makefile.mk |2 +-
 21 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit cc501356222739f54b8e332b0760bc726850def7
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 20 15:57:50 2012 +0100

add $(COMMAND_ECHO) before idxdict line

diff --git a/dictionaries/ar/makefile.mk b/dictionaries/ar/makefile.mk
index dac74a8..2608e3f 100644
--- a/dictionaries/ar/makefile.mk
+++ b/dictionaries/ar/makefile.mk
@@ -91,4 +91,4 @@ $(DESCRIPTION_SRC) : description.xml
 .ENDIF
 
 $(EXTENSIONDIR)$/th_ar.idx : $(EXTENSIONDIR)$/th_ar.dat
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o 
$(EXTENSIONDIR)$/th_ar.idx $(EXTENSIONDIR)$/th_ar.dat
+ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ar.idx 
$(EXTENSIONDIR)$/th_ar.dat
diff --git a/dictionaries/bg_BG/makefile.mk b/dictionaries/bg_BG/makefile.mk
index 2e818cb..4730011 100644
--- a/dictionaries/bg_BG/makefile.mk
+++ b/dictionaries/bg_BG/makefile.mk
@@ -87,7 +87,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_bg_BG_v2.idx : $(EXTENSIONDIR)$/th_bg_BG_v2.dat
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o 
$(EXTENSIONDIR)$/th_bg_BG_v2.idx $(EXTENSIONDIR)$/th_bg_BG_v2.dat
+ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_bg_BG_v2.idx 
$(EXTENSIONDIR)$/th_bg_BG_v2.dat
 
 .IF $(WITH_LANG) != 
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/ca/makefile.mk b/dictionaries/ca/makefile.mk
index b61be4e..eeac8a1 100644
--- a/dictionaries/ca/makefile.mk
+++ b/dictionaries/ca/makefile.mk
@@ -97,7 +97,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_ca_ES_v3.idx : $(EXTENSIONDIR)$/th_ca_ES_v3.dat
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o 
$(EXTENSIONDIR)$/th_ca_ES_v3.idx $(EXTENSIONDIR)$/th_ca_ES_v3.dat
+ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx 
$(EXTENSIONDIR)$/th_ca_ES_v3.dat
 
 .IF $(WITH_LANG) != 
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/cs_CZ/makefile.mk b/dictionaries/cs_CZ/makefile.mk
index 818b53b..5fa6170 100644
--- a/dictionaries/cs_CZ/makefile.mk
+++ b/dictionaries/cs_CZ/makefile.mk
@@ -87,7 +87,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_cs_CZ_v2.idx : $(EXTENSIONDIR)$/th_cs_CZ_v2.dat
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o 
$(EXTENSIONDIR)$/th_cs_CZ_v2.idx $(EXTENSIONDIR)$/th_cs_CZ_v2.dat
+ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_cs_CZ_v2.idx 
$(EXTENSIONDIR)$/th_cs_CZ_v2.dat
 
 .IF $(WITH_LANG) != 
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/da_DK/makefile.mk b/dictionaries/da_DK/makefile.mk
index 839ad39..8dc64c0 100644
--- a/dictionaries/da_DK/makefile.mk
+++ b/dictionaries/da_DK/makefile.mk
@@ -91,7 +91,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_da_DK.idx : $(EXTENSIONDIR)$/th_da_DK.dat
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o 
$(EXTENSIONDIR)$/th_da_DK.idx $(EXTENSIONDIR)$/th_da_DK.dat
+ $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_da_DK.idx 
$(EXTENSIONDIR)$/th_da_DK.dat
 
 .IF $(WITH_LANG) != 
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/de/makefile.mk b/dictionaries/de/makefile.mk
index 547b7e4..ee8a954 100644
--- a/dictionaries/de/makefile.mk
+++ b/dictionaries/de/makefile.mk
@@ -98,9 +98,9 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_de_DE_v2.idx : $(EXTENSIONDIR)$/th_de_DE_v2.dat
- $(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict

[Libreoffice-commits] .: solenv/inc

[Andras Timar]

 solenv/inc/_tg_zip.mk |  100 --
 solenv/inc/tg_zip.mk  |   10 ++---
 2 files changed, 44 insertions(+), 66 deletions(-)

New commits:
commit 3aece33a9b46e8b3d5e620e76af26e817f68332f
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 20 17:47:26 2012 +0100

remove avoid_cvs_dir macro

diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index deb2aa0..da3560b 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -3,10 +3,8 @@
 .IF $(GUI)==WNT
 command_seperator=
 #command_seperator=^
-avoid_cvs_dir=-x *CVS* -x *.svn*
 .ELSE
 command_seperator=;
-avoid_cvs_dir=-x *CVS* -x *.svn*
  
 .ENDIF
 
@@ -52,9 +50,9 @@ $(ZIP1DEPFILE) :
 @echo #  $(MISC)/$(@:f)
 .IF $(ZIP1DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP1DIR)
-$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) 
$(foreach,j,$(ZIP1LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )}) $(avoid_cvs_dir)  
$(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
+$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP1DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP1FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP1DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP1EXT)/)) 
$(foreach,j,$(ZIP1LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )})  $(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
 .ELSE  # $(ZIP1DIR) != 
-$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/ 
$(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) 
{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ 
$(@:db)))} $j )}) $(avoid_cvs_dir)  $(MISC)/$(@:f)
+$(COMMAND_ECHO)-$(ZIPDEP) $(ZIP1FLAGS) $(subst,/misc/,/bin/ 
$(@:s/.dpzz/$(ZIP1EXT)/)) $(foreach,j,$(ZIP1LIST) 
{$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, $(subst,/misc/,/bin/ 
$(@:db)))} $j )})  $(MISC)/$(@:f)
 .ENDIF # $(ZIP1DIR) != 
 @echo $(@:n:s#\#/#) : makefile.mk  $(MISC)/$(@:f)
 
@@ -66,14 +64,14 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
 @echo -- $(eq,$?,$(?:s/delzip/zzz/) 
$(NULLDEV) )
 .IF $(ZIP1DIR) != 
 @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ 
$(@:db))}$(ZIP1EXT)
-$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} 
$(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) 
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) 
$(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  
$(avoid_cvs_dir) $(CHECKZIPRESULT)
+$(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} 
$(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) 
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) 
$(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  
$(CHECKZIPRESULT)
 $(COMMAND_ECHO)$(IFEXIST) 
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
 $(PERL) -w $(SOLARENV)/bin/cleanzip.pl 
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
 $(FI)
 $(COMMAND_ECHO)$(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ 
$(@:db))}$(ZIP1EXT)  $@ 
 $(COMMAND_ECHO)$(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ 
$(@:db))}$(ZIP1EXT)
 .ELSE  # $(ZIP1DIR) != 
-$(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $@ 
$(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, 
$(@:db))} $j )) -x delzip $(avoid_cvs_dir) $(CHECKZIPRESULT)
+$(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $@ 
$(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, 
$(@:db))} $j )) -x delzip $(CHECKZIPRESULT)
 $(COMMAND_ECHO)$(IFEXIST) $@ $(THEN) \
 $(PERL) -w $(SOLARENV)/bin/cleanzip.pl $@ \
 $(FI)
@@ -90,10 +88,8 @@ $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
 .IF $(GUI)==WNT
 command_seperator=
 #command_seperator=^
-avoid_cvs_dir=-x *CVS* -x *.svn*
 .ELSE
 command_seperator=;
-avoid_cvs_dir=-x *CVS* -x *.svn*
  
 .ENDIF
 
@@ -139,9 +135,9 @@ $(ZIP2DEPFILE) :
 @echo #  $(MISC)/$(@:f)
 .IF $(ZIP2DIR) != 
 $(COMMAND_ECHO)-$(MKDIRHIER) $(ZIP2DIR)
-$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz/$(ZIP2EXT)/)) 
$(foreach,j,$(ZIP2LIST) {$(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP2TARGET)_, 
$(subst,/misc/,/bin/ $(@:db)))} $j )}) $(avoid_cvs_dir)  
$(PWD)/$(PRJ)/$(ROUT)/misc/$(@:f)
+$(COMMAND_ECHO)$(CDD) $(subst,LANGDIR,. $(subst,/LANGDIR, $(ZIP2DIR))) 
$(command_seperator) $(ZIPDEP) $(ZIP2FLAGS) -prefix $(subst,LANGDIR,. 
$(subst,/LANGDIR, $(ZIP2DIR)))/ $(subst,/misc/,/bin/ $(@:s/.dpzz

[Libreoffice-commits] .: solenv/inc

[Andras Timar]

 solenv/inc/extension_post.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit aad0b5d6a6ad8a3a895c6ffba3390af6861017d7
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 20 18:04:38 2012 +0100

add $(COMMAND-ECHO)

diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk
index 20b8682..8a1a328 100644
--- a/solenv/inc/extension_post.mk
+++ b/solenv/inc/extension_post.mk
@@ -39,15 +39,15 @@ fixme4=$(fixme:n)
 $(EXTENSIONDIR)/$(COMPONENT_CONFIGDEST)/%.xcu : %.xcu
 # ugly hacking to workaround prepended first source path
 @@-$(MKDIRHIER) $(subst,$(fixme2),$(MISC) $(@:d))
-$(GNUCOPY) $ $(subst,$(fixme2),$(MISC) $@)
+$(COMMAND_ECHO)$(GNUCOPY) $ $(subst,$(fixme2),$(MISC) $@)
 
 $(EXTENSIONDIR)/$(COMPONENT_CONFIGDESTSCHEMA)/%.xcs : %.xcs
 @@-$(MKDIRHIER) $(subst,$(fixme4),$(MISC) $(@:d))
-$(GNUCOPY) $ $(subst,$(fixme4),$(MISC) $@)
+$(COMMAND_ECHO)$(GNUCOPY) $ $(subst,$(fixme4),$(MISC) $@)
 
 $(EXTENSIONDIR)/%.jar : $(SOLARBINDIR)/%.jar
 @@-$(MKDIRHIER) $(@:d)
-$(GNUCOPY) $ $@
+$(COMMAND_ECHO)$(GNUCOPY) $ $@
 
 .IF $(COMPONENT_FILES)!=
 COMPONENT_FILES_SRC*=./
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dictionaries/hu_HU

[Andras Timar]

 dictionaries/hu_HU/makefile.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3079747297b9295de2b1c4a4629c392120d2334d
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 20 18:09:10 2012 +0100

enable thesaurus check for hu_HU

diff --git a/dictionaries/hu_HU/makefile.mk b/dictionaries/hu_HU/makefile.mk
index 7c9d790..40c54cd 100644
--- a/dictionaries/hu_HU/makefile.mk
+++ b/dictionaries/hu_HU/makefile.mk
@@ -106,7 +106,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) 
$(COMPONENT_UNZIP_FILES)
 # global targets for extension packing
 .INCLUDE : extension_post.mk
 
-#.INCLUDE :  $(PRJ)$/prj$/tests.mk
+.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_hu_HU_v2.idx : $(EXTENSIONDIR)$/th_hu_HU_v2.dat
  $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) 
$(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_hu_HU_v2.idx 
$(EXTENSIONDIR)$/th_hu_HU_v2.dat
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dictionaries/source

[Andras Timar]

 dictionaries/source/idxdict.cpp |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 8a74106d1ecc3d146f514a2414a4785bc8dd0f01
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 20 18:13:33 2012 +0100

silence idxdict tool

diff --git a/dictionaries/source/idxdict.cpp b/dictionaries/source/idxdict.cpp
index 6844afd..9b0cbc2 100644
--- a/dictionaries/source/idxdict.cpp
+++ b/dictionaries/source/idxdict.cpp
@@ -90,8 +90,6 @@ int main(int argc, char *argv[])
 ::exit(99);
 }
 
-cout  outputFile  endl;
-
 outputStream  encoding  '\n'  entries.size()  '\n';
 
 for (multimapstring, size_t::const_iterator ii(entries.begin());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - odk/util solenv/bin solenv/inc

[Andras Timar]

 odk/util/makefile.mk|1 
 solenv/bin/cleanzip.pl  |   59 -
 solenv/inc/_tg_zip.mk   |  100 
 solenv/inc/extension_pre.mk |2 
 solenv/inc/tg_zip.mk|   10 
 5 files changed, 12 insertions(+), 160 deletions(-)

New commits:
commit 24f63831af82e71133fae0fc8309d1f752a402bf
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 20 20:24:54 2012 +0100

remove cleanzip.pl

The issue it solves does not exist in our build environment.
https://issues.apache.org/ooo/show_bug.cgi?id=98365
The script removed g+s attributes from directories in zip files.

diff --git a/odk/util/makefile.mk b/odk/util/makefile.mk
index 7f6517e..28f6c8e 100644
--- a/odk/util/makefile.mk
+++ b/odk/util/makefile.mk
@@ -24,7 +24,6 @@ ALLTAR:\
 
 $(BIN)$/$(PRODUCTZIPFILE) : $(SDK_CONTENT_CHECK_FILES) $(SDK_CHECK_FLAGS)
 cd $(BIN)$/$(PRODUCT_NAME)  zip -urq ..$/$(PRODUCTZIPFILE) . 
$(CHECKZIPRESULT)
-$(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@
 #  cd $(BIN)$/$(PRODUCT_NAME)  zip -urq ..$/$(PRODUCTZIPFILE) . -x 
idl/* $(CHECKZIPRESULT)
 #  cd $(BIN)$/$(PRODUCT_NAME)  zip -urq ..$/odkidl.zip idl/* 
$(CHECKZIPRESULT)
 
diff --git a/solenv/bin/cleanzip.pl b/solenv/bin/cleanzip.pl
deleted file mode 100755
index 5e1502b..000
--- a/solenv/bin/cleanzip.pl
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/perl -w
-#*
-#
-# 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.
-#
-#*
-
-sub usage
-{
-print Cleanup unwanted unix attributes in zip archives\n\n;
-print Usage:\n;
-print $0 archive\n\n;
-exit(1);
-}
-
-usage() if ! defined $ARGV[0];
-
-my $filename = $ARGV[0];
-use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
-my $zip = Archive::Zip-new();
-
-unless ( $zip-read( $filename ) == AZ_OK ) {
-die $0: ERROR reading $filename\n;
-}
-my @members = $zip -members();
-
-foreach my $member ( @members ) {
-my $attribs = $member-unixFileAttributes();
-if ( $member-isDirectory ) {
-$attribs = $attribs  0b1011;
-$member-unixFileAttributes($attribs)
-}
-}
-unless ( $zip-writeToFileNamed( ${filename}._new ) == AZ_OK ) {
-die $0: ERROR reading ${filename}_new\n;
-}
-rename($filename._new, $filename);
-
diff --git a/solenv/inc/_tg_zip.mk b/solenv/inc/_tg_zip.mk
index da3560b..2dfe467 100644
--- a/solenv/inc/_tg_zip.mk
+++ b/solenv/inc/_tg_zip.mk
@@ -58,23 +58,15 @@ $(ZIP1DEPFILE) :
 
 
 $(ZIP1TARGETN) : delzip $(ZIP1DEPS)
-@echo Making:$(@:f)
+@echo [ZIP] $(@:f)
 @@$(!eq,$?,$(?:s/delzip/zzz/) -$(RM) echo) $(uniq $@ 
$(subst,$(COMMON_OUTDIR),$(OUTPATH) $@))
-@$(eq,$?,$(?:s/delzip/zzz/) noop echo ) rebuilding zipfiles
-@echo -- $(eq,$?,$(?:s/delzip/zzz/) 
$(NULLDEV) )
 .IF $(ZIP1DIR) != 
 @@-$(GNUCOPY) -p $@ $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ 
$(@:db))}$(ZIP1EXT)
 $(COMMAND_ECHO)-$(CDD) $(subst,LANGDIR,{$(subst,$(ZIP1HELPVAR)_, $(@:db))} 
$(ZIP1DIR)) $(command_seperator) zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) 
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) 
$(subst,LANGDIR_away/, $(ZIP1LIST:s/LANGDIR/LANGDIR_away/)) -x delzip  
$(CHECKZIPRESULT)
-$(COMMAND_ECHO)$(IFEXIST) 
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) $(THEN) \
-$(PERL) -w $(SOLARENV)/bin/cleanzip.pl 
$(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ $(@:db))}$(ZIP1EXT) \
-$(FI)
 $(COMMAND_ECHO)$(COPY) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ 
$(@:db))}$(ZIP1EXT)  $@ 
 $(COMMAND_ECHO)$(RM) $(ZIP1TMP).$(ZIP1TARGET){$(subst,$(ZIP1HELPVAR),_ 
$(@:db))}$(ZIP1EXT)
 .ELSE  # $(ZIP1DIR) != 
 $(COMMAND_ECHO)zip $(ZIP_VERBOSITY) $(ZIP1FLAGS) $@ 
$(foreach,j,$(ZIP1LIST) $(subst,LANGDIR,{$(subst,$(BIN)/$(ZIP1TARGET)_, 
$(@:db))} $j )) -x delzip $(CHECKZIPRESULT)
-$(COMMAND_ECHO)$(IFEXIST

[Libreoffice-commits] .: readlicense_oo/odt

[Andras Timar]

 readlicense_oo/odt/CREDITS.odt |binary
 1 file changed

New commits:
commit 0699556c303d724c89b3e9873587c4e9e0d6fe99
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 20 22:36:29 2012 +0100

updated LibreOffice contributors' credits (2012-02-02)

diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/odt/CREDITS.odt
index b9246dc..f051e60 100644
Binary files a/readlicense_oo/odt/CREDITS.odt and 
b/readlicense_oo/odt/CREDITS.odt differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: scp2/source

[Andras Timar]

 scp2/source/winexplorerext/registryitem_winexplorerext.scp |   24 ++---
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 2786c354ce4f7ff215fffe83ef242ee3b411fb13
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 17 12:58:37 2012 +0100

fdo#46167 fix path of shell extension dll in registry

diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp 
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index c7def3e..32a5ef8 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -35,8 +35,8 @@ RegistryItem 
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -58,8 +58,8 @@ RegistryItem 
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -90,8 +90,8 @@ RegistryItem 
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -122,8 +122,8 @@ RegistryItem 
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
 ModuleID = gid_Module_Root;
 Subkey = CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32;
 Styles = (X64); // Values: X64 / X64_ONLY
-Value = [INSTALLLOCATION]shlxthdl\ooofilt.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\ooofilt_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\ooofilt.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -163,8 +163,8 @@ RegistryItem 
gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
 ModuleID = gid_Module_Optional_Winexplorerext;
 Styles = (X64);
 Subkey = CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\shlxthdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\shlxthdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -197,8 +197,8 @@ RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
 ComponentCondition = VersionNT = 600;
 Styles = (X64);
 Subkey = CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32;
-Value = [INSTALLLOCATION]shlxthdl\propertyhdl.dll;
-Val64 = [INSTALLLOCATION]shlxthdl\propertyhdl_x64.dll;
+Value = [INSTALLLOCATION]program\shlxthdl\propertyhdl.dll;
+Val64 = [INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll;
 End
 
 RegistryItem 
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: l10ntools/source xmlhelp/source

[Andras Timar]

 l10ntools/source/help/HelpIndexerTool.java   |5 -
 xmlhelp/source/com/sun/star/help/HelpSearch.java |5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 7636d37f8f9c53d694c4fe38581f3b495d53670e
Author: Andras Timar ati...@suse.com
Date:   Fri Feb 17 21:43:31 2012 +0100

fdo#40665 use CJKAnalyzer for ko, zh-CN, and zh-TW, too

diff --git a/l10ntools/source/help/HelpIndexerTool.java 
b/l10ntools/source/help/HelpIndexerTool.java
index d1d0873..8e42d55 100644
--- a/l10ntools/source/help/HelpIndexerTool.java
+++ b/l10ntools/source/help/HelpIndexerTool.java
@@ -185,7 +185,10 @@ public class HelpIndexerTool
 
 try
 {
-Analyzer analyzer = aLanguageStr.equals(ja) ? (Analyzer)new 
CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
+Analyzer analyzer = ( aLanguageStr.equals(ja)
+|| aLanguageStr.equals(ko)
+|| aLanguageStr.equals(zh-CN)
+|| aLanguageStr.equals(zh-TW) ) ? 
(Analyzer)new CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
 IndexWriter writer = new IndexWriter( aIndexDir, analyzer, true );
 int nRet = indexDocs( writer, aModule, bExtensionMode, 
aCaptionFilesDir, aContentFilesDir );
 if( nRet != -1 )
diff --git a/xmlhelp/source/com/sun/star/help/HelpSearch.java 
b/xmlhelp/source/com/sun/star/help/HelpSearch.java
index dc31514..03aadea 100755
--- a/xmlhelp/source/com/sun/star/help/HelpSearch.java
+++ b/xmlhelp/source/com/sun/star/help/HelpSearch.java
@@ -255,7 +255,10 @@ public class HelpSearch
 {
 IndexReader reader = IndexReader.open( aIndexStr );
 Searcher searcher = new IndexSearcher( reader );
-Analyzer analyzer = aLanguageStr.equals(ja) ? (Analyzer)new 
CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
+Analyzer analyzer = ( aLanguageStr.equals(ja)
+|| aLanguageStr.equals(ko)
+|| aLanguageStr.equals(zh-CN)
+|| aLanguageStr.equals(zh-TW) ) ? 
(Analyzer)new CJKAnalyzer() : (Analyzer)new StandardAnalyzer();
 
 String aField;
 if( bCaptionOnly )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - Repository.mk

[Andras Timar]

 Repository.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 4161ce76cd0fa7135d1f51fbe89a9118cdee94bf
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 15 15:12:21 2012 +0100

fix build on Windows

diff --git a/Repository.mk b/Repository.mk
index 3c2c93e..863024f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -61,11 +61,14 @@ $(eval $(call gb_Helper_register_executables,OOO,\
sdraw \
simpress \
soffice \
+   soffice_bin \
smath \
sweb \
swriter \
unoinfo \
unopkg \
+   unopkg_bin \
+   unopkg_com \
unopkgio \
 ))
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/source

[Andras Timar]

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |   34 ---
 1 file changed, 25 insertions(+), 9 deletions(-)

New commits:
commit 545a55895acfe15a454ca701eff7197eb8dbc3f3
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date:   Tue Feb 14 18:25:47 2012 +0100

fix layout of checkboxes on Extension Manager dialog fdo#45851

I changed the sizes and the positions of the checkboxes. So there won't be
truncated checkboxes in any languages.

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 416e567..39606f1 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1244,16 +1244,32 @@ void ExtMgrDialog::Resize()
 
 // checkboxes + text type of extensions
 
-Size aCBSize(m_aBundledCbx.GetSizePixel());
-
-offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - 
RSC_SP_DLG_INNERBORDER_RIGHT - 3*(aCBSize.Width() + RSC_SP_CTRL_GROUP_X) );
+long nWidth = m_aBundledCbx.GetCtrlTextWidth( m_aBundledCbx.GetText() );
+Size aBCBSize(m_aBundledCbx.GetSizePixel());
+aBCBSize.Width() = nWidth + 30;
+aBCBSize.Height() += 3;
+m_aBundledCbx.SetSizePixel( aBCBSize );
+
+nWidth = m_aSharedCbx.GetCtrlTextWidth( m_aSharedCbx.GetText() );
+Size aSCBSize(m_aSharedCbx.GetSizePixel());
+aSCBSize.Width() = nWidth + 30;
+aSCBSize.Height() += 3;
+m_aSharedCbx.SetSizePixel( aSCBSize );
+
+nWidth = m_aUserCbx.GetCtrlTextWidth( m_aUserCbx.GetText() );
+Size aUCBSize(m_aUserCbx.GetSizePixel());
+aUCBSize.Width() = nWidth + 30;
+aUCBSize.Height() += 3;
+m_aUserCbx.SetSizePixel( aUCBSize );
+
+offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - 
RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_SP_CTRL_GROUP_X - aBCBSize.Width() - 
aSCBSize.Width() - aUCBSize.Width() );
 
 aPos = Point(offsetX, aPos.Y() - RSC_CD_CHECKBOX_HEIGHT - 
2*RSC_SP_DLG_INNERBORDER_BOTTOM);
-m_aBundledCbx.SetPosSizePixel(aPos, aCBSize);
-aPos.X() = aPos.X() + aCBSize.Width() + 2 * RSC_SP_CTRL_GROUP_X;
-m_aSharedCbx.SetPosSizePixel(aPos, aCBSize);
-aPos.X() = aPos.X() + aCBSize.Width() + 2 * RSC_SP_CTRL_GROUP_X;
-m_aUserCbx.SetPosSizePixel(aPos, aCBSize);
+m_aBundledCbx.SetPosPixel( aPos );
+aPos.X() += aBCBSize.Width() + 3 * RSC_SP_CTRL_GROUP_X;
+m_aSharedCbx.SetPosPixel( aPos );
+aPos.X() += aSCBSize.Width() + 3 * RSC_SP_CTRL_GROUP_X;
+m_aUserCbx.SetPosPixel( aPos );
 
 Size aFTTypeOfExtSize(m_aTypeOfExtTxt.GetSizePixel());
 aPos = Point(RSC_SP_DLG_INNERBORDER_LEFT , aPos.Y() - 
RSC_CD_FIXEDTEXT_HEIGHT - 2*RSC_SP_DLG_INNERBORDER_BOTTOM);
@@ -1269,7 +1285,7 @@ void ExtMgrDialog::Resize()
 
 Size aSize( aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - 
RSC_SP_DLG_INNERBORDER_RIGHT,
 aTotalSize.Height() - aBtnSize.Height() - LINE_SIZE - 
aBtnSize.Height()
-- aCBSize.Height() - aFTTypeOfExtSize.Height()
+- aBCBSize.Height() - aFTTypeOfExtSize.Height()
 - RSC_SP_DLG_INNERBORDER_TOP - 5*RSC_SP_DLG_INNERBORDER_BOTTOM 
);
 
 m_pExtensionBox-SetSizePixel(aSize );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - desktop/source

[Andras Timar]

 desktop/source/deployment/gui/dp_gui_dialog2.cxx |   34 ---
 1 file changed, 25 insertions(+), 9 deletions(-)

New commits:
commit ef95aa6facbefaa49a8c9b3b6bb2a88b0fb3df83
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date:   Tue Feb 14 18:25:47 2012 +0100

fix layout of checkboxes on Extension Manager dialog fdo#45851

I changed the sizes and the positions of the checkboxes. So there won't be
truncated checkboxes in any languages.

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

diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx 
b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
index 7199aaf..de324ef 100644
--- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx
+++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx
@@ -1244,16 +1244,32 @@ void ExtMgrDialog::Resize()
 
 // checkboxes + text type of extensions
 
-Size aCBSize(m_aBundledCbx.GetSizePixel());
-
-offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - 
RSC_SP_DLG_INNERBORDER_RIGHT - 3*(aCBSize.Width() + RSC_SP_CTRL_GROUP_X) );
+long nWidth = m_aBundledCbx.GetCtrlTextWidth( m_aBundledCbx.GetText() );
+Size aBCBSize(m_aBundledCbx.GetSizePixel());
+aBCBSize.Width() = nWidth + 30;
+aBCBSize.Height() += 3;
+m_aBundledCbx.SetSizePixel( aBCBSize );
+
+nWidth = m_aSharedCbx.GetCtrlTextWidth( m_aSharedCbx.GetText() );
+Size aSCBSize(m_aSharedCbx.GetSizePixel());
+aSCBSize.Width() = nWidth + 30;
+aSCBSize.Height() += 3;
+m_aSharedCbx.SetSizePixel( aSCBSize );
+
+nWidth = m_aUserCbx.GetCtrlTextWidth( m_aUserCbx.GetText() );
+Size aUCBSize(m_aUserCbx.GetSizePixel());
+aUCBSize.Width() = nWidth + 30;
+aUCBSize.Height() += 3;
+m_aUserCbx.SetSizePixel( aUCBSize );
+
+offsetX = 0.5*(aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - 
RSC_SP_DLG_INNERBORDER_RIGHT - 3*RSC_SP_CTRL_GROUP_X - aBCBSize.Width() - 
aSCBSize.Width() - aUCBSize.Width() );
 
 aPos = Point(offsetX, aPos.Y() - RSC_CD_CHECKBOX_HEIGHT - 
2*RSC_SP_DLG_INNERBORDER_BOTTOM);
-m_aBundledCbx.SetPosSizePixel(aPos, aCBSize);
-aPos.X() = aPos.X() + aCBSize.Width() + 2 * RSC_SP_CTRL_GROUP_X;
-m_aSharedCbx.SetPosSizePixel(aPos, aCBSize);
-aPos.X() = aPos.X() + aCBSize.Width() + 2 * RSC_SP_CTRL_GROUP_X;
-m_aUserCbx.SetPosSizePixel(aPos, aCBSize);
+m_aBundledCbx.SetPosPixel( aPos );
+aPos.X() += aBCBSize.Width() + 3 * RSC_SP_CTRL_GROUP_X;
+m_aSharedCbx.SetPosPixel( aPos );
+aPos.X() += aSCBSize.Width() + 3 * RSC_SP_CTRL_GROUP_X;
+m_aUserCbx.SetPosPixel( aPos );
 
 Size aFTTypeOfExtSize(m_aTypeOfExtTxt.GetSizePixel());
 aPos = Point(RSC_SP_DLG_INNERBORDER_LEFT , aPos.Y() - 
RSC_CD_FIXEDTEXT_HEIGHT - 2*RSC_SP_DLG_INNERBORDER_BOTTOM);
@@ -1269,7 +1285,7 @@ void ExtMgrDialog::Resize()
 
 Size aSize( aTotalSize.Width() - RSC_SP_DLG_INNERBORDER_LEFT - 
RSC_SP_DLG_INNERBORDER_RIGHT,
 aTotalSize.Height() - aBtnSize.Height() - LINE_SIZE - 
aBtnSize.Height()
-- aCBSize.Height() - aFTTypeOfExtSize.Height()
+- aBCBSize.Height() - aFTTypeOfExtSize.Height()
 - RSC_SP_DLG_INNERBORDER_TOP - 5*RSC_SP_DLG_INNERBORDER_BOTTOM 
);
 
 m_pExtensionBox-SetSizePixel(aSize );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: icon-themes/galaxy

[Andras Timar]

 icon-themes/galaxy/res/baswatr.png |binary
 1 file changed

New commits:
commit 7c3fab1be983241c61df2c871556ba3e7e35dec6
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 13 21:19:36 2012 +0100

better Galaxy icon for Remove Watchpoint in Basic IDE

diff --git a/icon-themes/galaxy/res/baswatr.png 
b/icon-themes/galaxy/res/baswatr.png
index c350fa8..cf4015d 100644
Binary files a/icon-themes/galaxy/res/baswatr.png and 
b/icon-themes/galaxy/res/baswatr.png differ
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: basctl/source

[Andras Timar]

 basctl/source/basicide/baside2b.cxx |   38 +++-
 1 file changed, 21 insertions(+), 17 deletions(-)

New commits:
commit 1f0784d2b877910b4a8ba3ed599333b5000ef7d0
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date:   Mon Feb 13 16:06:03 2012 +0100

Wrong size of 'Remove watch' button at Basic IDE. fdo#44237

This patch resize the nVirtToolBoxHeight in WatchWindow::WatchWindow if
the aRemoveWatchButton plus some space is higher than nVirtToolBoxHeight. So
the aRemoveWatchButton doesn't go into aHeaderBar.

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index f74e134..d42a407 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1200,7 +1200,28 @@ WatchWindow::WatchWindow( Window* pParent ) :
 aXEdit.SetAccessibleName(String(IDEResId( RID_STR_WATCHNAME)));
 aTreeListBox.SetAccessibleName(String(IDEResId(RID_STR_WATCHNAME)));
 
+long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3;
+aXEdit.SetPosPixel( Point( nTextLen, 3 ) );
+aXEdit.SetAccHdl( LINK( this, WatchWindow, EditAccHdl ) );
+aXEdit.GetAccelerator().InsertItem( 1, KeyCode( KEY_RETURN ) );
+aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
+aXEdit.Show();
+
+aRemoveWatchButton.Disable();
+aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
+aRemoveWatchButton.SetPosPixel( Point( nTextLen + 
aXEdit.GetSizePixel().Width() + 4, 2 ) );
+Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
+aSz.Width() += 6;
+aSz.Height() += 6;
+aRemoveWatchButton.SetSizePixel( aSz );
+aRemoveWatchButton.Show();
+
+long nRWBtnSize = 
aRemoveWatchButton.GetModeImage().GetSizePixel().Height() + 10;
 nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7;
+
+if ( nRWBtnSize  nVirtToolBoxHeight )
+nVirtToolBoxHeight = nRWBtnSize;
+
 nHeaderBarHeight = 16;
 
 aTreeListBox.SetHelpId(HID_BASICIDE_WATCHWINDOW_LIST);
@@ -1232,25 +1253,8 @@ WatchWindow::WatchWindow( Window* pParent ) :
 
 aHeaderBar.Show();
 
-aRemoveWatchButton.Disable();
-
 aTreeListBox.Show();
 
-long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER;
-aXEdit.SetPosPixel( Point( nTextLen, 3 ) );
-aXEdit.SetAccHdl( LINK( this, WatchWindow, EditAccHdl ) );
-aXEdit.GetAccelerator().InsertItem( 1, KeyCode( KEY_RETURN ) );
-aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
-aXEdit.Show();
-
-aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
-aRemoveWatchButton.SetPosPixel( Point( nTextLen + 
aXEdit.GetSizePixel().Width() + 4, 2 ) );
-Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
-aSz.Width() += 6;
-aSz.Height() += 6;
-aRemoveWatchButton.SetSizePixel( aSz );
-aRemoveWatchButton.Show();
-
 SetText( String( IDEResId( RID_STR_WATCHNAME ) ) );
 
 SetHelpId( HID_BASICIDE_WATCHWINDOW );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - basctl/source

[Andras Timar]

 basctl/source/basicide/baside2b.cxx |   38 +++-
 1 file changed, 21 insertions(+), 17 deletions(-)

New commits:
commit b7570fce38cb5a7b4fc7042d7f8b0bde2c134913
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date:   Mon Feb 13 16:06:03 2012 +0100

Wrong size of 'Remove watch' button at Basic IDE. fdo#44237

This patch resize the nVirtToolBoxHeight in WatchWindow::WatchWindow if
the aRemoveWatchButton plus some space is higher than nVirtToolBoxHeight. So
the aRemoveWatchButton doesn't go into aHeaderBar.

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

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index dfef385..2c960bb 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1160,7 +1160,28 @@ WatchWindow::WatchWindow( Window* pParent ) :
 aXEdit.SetAccessibleName(String(IDEResId( RID_STR_WATCHNAME)));
 aTreeListBox.SetAccessibleName(String(IDEResId(RID_STR_WATCHNAME)));
 
+long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER + 3;
+aXEdit.SetPosPixel( Point( nTextLen, 3 ) );
+aXEdit.SetAccHdl( LINK( this, WatchWindow, EditAccHdl ) );
+aXEdit.GetAccelerator().InsertItem( 1, KeyCode( KEY_RETURN ) );
+aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
+aXEdit.Show();
+
+aRemoveWatchButton.Disable();
+aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
+aRemoveWatchButton.SetPosPixel( Point( nTextLen + 
aXEdit.GetSizePixel().Width() + 4, 2 ) );
+Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
+aSz.Width() += 6;
+aSz.Height() += 6;
+aRemoveWatchButton.SetSizePixel( aSz );
+aRemoveWatchButton.Show();
+
+long nRWBtnSize = 
aRemoveWatchButton.GetModeImage().GetSizePixel().Height() + 10;
 nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7;
+
+if ( nRWBtnSize  nVirtToolBoxHeight )
+nVirtToolBoxHeight = nRWBtnSize;
+
 nHeaderBarHeight = 16;
 
 aTreeListBox.SetHelpId(HID_BASICIDE_WATCHWINDOW_LIST);
@@ -1192,25 +1213,8 @@ WatchWindow::WatchWindow( Window* pParent ) :
 
 aHeaderBar.Show();
 
-aRemoveWatchButton.Disable();
-
 aTreeListBox.Show();
 
-long nTextLen = GetTextWidth( aWatchStr ) + DWBORDER;
-aXEdit.SetPosPixel( Point( nTextLen, 3 ) );
-aXEdit.SetAccHdl( LINK( this, WatchWindow, EditAccHdl ) );
-aXEdit.GetAccelerator().InsertItem( 1, KeyCode( KEY_RETURN ) );
-aXEdit.GetAccelerator().InsertItem( 2, KeyCode( KEY_ESCAPE ) );
-aXEdit.Show();
-
-aRemoveWatchButton.SetClickHdl( LINK( this, WatchWindow, ButtonHdl ) );
-aRemoveWatchButton.SetPosPixel( Point( nTextLen + 
aXEdit.GetSizePixel().Width() + 4, 2 ) );
-Size aSz( aRemoveWatchButton.GetModeImage().GetSizePixel() );
-aSz.Width() += 6;
-aSz.Height() += 6;
-aRemoveWatchButton.SetSizePixel( aSz );
-aRemoveWatchButton.Show();
-
 SetText( String( IDEResId( RID_STR_WATCHNAME ) ) );
 
 SetHelpId( HID_BASICIDE_WATCHWINDOW );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: sfx2/source

[Andras Timar]

 sfx2/source/dialog/alienwarn.cxx |   58 ++-
 1 file changed, 33 insertions(+), 25 deletions(-)

New commits:
commit 05720546215976d8d42fa7321f455c641147db9f
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date:   Fri Feb 10 13:35:23 2012 +0100

fdo#45330 Improving layout of Confirm File Format dialog

Although fdo#45330 was a duplicate of fdo#45117 which was fixed
earlier, this patch makes the layout look better when the button
text is very long, because it resizes the boundary boxes of fixed
text and ruler, too. I've changed the sequence of
the functions in InitSize() and the size calculations.

diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 3e99575..8ed0b71 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -119,13 +119,32 @@ void SfxAlienWarningDialog::InitSize()
 m_aMoreInfoBtn.SetPosSizePixel( aNewPoint, aNewSize );
 }
 
-// text of checkbox to wide - add new line
-nTxtW = m_aWarningOnBox.GetCtrlTextWidth( m_aWarningOnBox.GetText() ) + 
IMPL_EXTRA_BUTTON_WIDTH;
+// recalculate the size and position of the buttons
+m_aMoreInfoBtn.Hide();
+nTxtW = m_aKeepCurrentBtn.GetCtrlTextWidth( m_aKeepCurrentBtn.GetText() );
+nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
+Size aNewSize = m_aKeepCurrentBtn.GetSizePixel();
+aNewSize.Width() = nTxtW;
+m_aKeepCurrentBtn.SetSizePixel( aNewSize );
+Point aPos = m_aSaveODFBtn.GetPosPixel();
+aPos.X() = AW_COL_3 + nTxtW;
+m_aSaveODFBtn.SetPosPixel( aPos );
+nTxtW = m_aSaveODFBtn.GetCtrlTextWidth( m_aSaveODFBtn.GetText() );
+nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
+aNewSize = m_aSaveODFBtn.GetSizePixel();
+aNewSize.Width() = nTxtW;
+m_aSaveODFBtn.SetSizePixel( aNewSize );
+long nBtnsWidthSize = m_aKeepCurrentBtn.GetSizePixel().Width() + 
m_aSaveODFBtn.GetSizePixel().Width() + AW_COL_3 + IMPL_EXTRA_BUTTON_WIDTH;
+
+// resize + text of checkbox too wide - add new line
+aNewSize = m_aWarningOnBox.GetSizePixel();
+aNewSize.Width() = nBtnsWidthSize - 4*IMPL_EXTRA_BUTTON_WIDTH;
+m_aWarningOnBox.SetSizePixel( aNewSize );
+nTxtW = m_aWarningOnBox.GetCtrlTextWidth( m_aWarningOnBox.GetText() );
 nCtrlW = m_aWarningOnBox.GetSizePixel().Width();
 if ( nTxtW = nCtrlW )
 {
 long nTextHeight = m_aWarningOnBox.GetTextHeight();
-Size aNewSize = m_aWarningOnBox.GetSizePixel();
 aNewSize.Height() += nTextHeight;
 m_aWarningOnBox.SetSizePixel( aNewSize );
 aNewSize = GetSizePixel();
@@ -133,15 +152,18 @@ void SfxAlienWarningDialog::InitSize()
 SetSizePixel( aNewSize );
 }
 
-// align the size of the information text control (FixedText) to its 
content
+// resize + align the size of the information text control (FixedText) to 
its content
+aNewSize = m_aInfoText.GetSizePixel();
+aNewSize.Width() = nBtnsWidthSize - 4*IMPL_EXTRA_BUTTON_WIDTH;
+m_aInfoText.SetSizePixel( aNewSize );
 Size aMinSize = m_aInfoText.CalcMinimumSize( 
m_aInfoText.GetSizePixel().Width() );
 long nTxtH = aMinSize.Height();
 long nCtrlH = m_aInfoText.GetSizePixel().Height();
 long nDelta = ( nCtrlH - nTxtH );
-Size aNewSize = m_aInfoText.GetSizePixel();
 aNewSize.Height() -= nDelta;
 m_aInfoText.SetSizePixel( aNewSize );
 
+
 // new position for the succeeding windows
 Window* pWins[] =
 {
@@ -155,31 +177,17 @@ void SfxAlienWarningDialog::InitSize()
 (*pCurrent)-SetPosPixel( aNewPos );
 }
 
-// recalculate the size and position of the buttons
-m_aMoreInfoBtn.Hide();
-nTxtW = m_aKeepCurrentBtn.GetCtrlTextWidth( m_aKeepCurrentBtn.GetText() );
-nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
-aNewSize = m_aKeepCurrentBtn.GetSizePixel();
-aNewSize.Width() = nTxtW;
-m_aKeepCurrentBtn.SetSizePixel( aNewSize );
-Point aPos = m_aSaveODFBtn.GetPosPixel();
-aPos.X() = AW_COL_3 + nTxtW;
-m_aSaveODFBtn.SetPosPixel( aPos );
-nTxtW = m_aSaveODFBtn.GetCtrlTextWidth( m_aSaveODFBtn.GetText() );
-nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
-aNewSize = m_aSaveODFBtn.GetSizePixel();
-aNewSize.Width() = nTxtW;
-m_aSaveODFBtn.SetSizePixel( aNewSize );
-
 // new size of the dialog
 aNewSize = GetSizePixel();
 aNewSize.Height() -= nDelta;
-if (aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH  aNewSize.Width())
-{
-aNewSize.Width() = aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH;
-}
+aNewSize.Width() = nBtnsWidthSize;
 SetSizePixel( aNewSize );
 
+// resize the FixedLine
+aNewSize = m_aOptionLine.GetSizePixel();
+aNewSize.Width() = GetSizePixel().Width();
+m_aOptionLine.SetSizePixel( aNewSize );
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sfx2/source

[Andras Timar]

 sfx2/source/dialog/alienwarn.cxx |   58 ++-
 1 file changed, 33 insertions(+), 25 deletions(-)

New commits:
commit e1fef2029dc2551470f356738ab45c43fd3f9d6c
Author: Tomcsik Bence tomcsikbe...@gmail.com
Date:   Fri Feb 10 13:35:23 2012 +0100

fdo#45330 Improving layout of Confirm File Format dialog

Although fdo#45330 was a duplicate of fdo#45117 which was fixed
earlier, this patch makes the layout look better when the button
text is very long, because it resizes the boundary boxes of fixed
text and ruler, too. I've changed the sequence of
the functions in InitSize() and the size calculations.

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

diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 3e99575..8ed0b71 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -119,13 +119,32 @@ void SfxAlienWarningDialog::InitSize()
 m_aMoreInfoBtn.SetPosSizePixel( aNewPoint, aNewSize );
 }
 
-// text of checkbox to wide - add new line
-nTxtW = m_aWarningOnBox.GetCtrlTextWidth( m_aWarningOnBox.GetText() ) + 
IMPL_EXTRA_BUTTON_WIDTH;
+// recalculate the size and position of the buttons
+m_aMoreInfoBtn.Hide();
+nTxtW = m_aKeepCurrentBtn.GetCtrlTextWidth( m_aKeepCurrentBtn.GetText() );
+nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
+Size aNewSize = m_aKeepCurrentBtn.GetSizePixel();
+aNewSize.Width() = nTxtW;
+m_aKeepCurrentBtn.SetSizePixel( aNewSize );
+Point aPos = m_aSaveODFBtn.GetPosPixel();
+aPos.X() = AW_COL_3 + nTxtW;
+m_aSaveODFBtn.SetPosPixel( aPos );
+nTxtW = m_aSaveODFBtn.GetCtrlTextWidth( m_aSaveODFBtn.GetText() );
+nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
+aNewSize = m_aSaveODFBtn.GetSizePixel();
+aNewSize.Width() = nTxtW;
+m_aSaveODFBtn.SetSizePixel( aNewSize );
+long nBtnsWidthSize = m_aKeepCurrentBtn.GetSizePixel().Width() + 
m_aSaveODFBtn.GetSizePixel().Width() + AW_COL_3 + IMPL_EXTRA_BUTTON_WIDTH;
+
+// resize + text of checkbox too wide - add new line
+aNewSize = m_aWarningOnBox.GetSizePixel();
+aNewSize.Width() = nBtnsWidthSize - 4*IMPL_EXTRA_BUTTON_WIDTH;
+m_aWarningOnBox.SetSizePixel( aNewSize );
+nTxtW = m_aWarningOnBox.GetCtrlTextWidth( m_aWarningOnBox.GetText() );
 nCtrlW = m_aWarningOnBox.GetSizePixel().Width();
 if ( nTxtW = nCtrlW )
 {
 long nTextHeight = m_aWarningOnBox.GetTextHeight();
-Size aNewSize = m_aWarningOnBox.GetSizePixel();
 aNewSize.Height() += nTextHeight;
 m_aWarningOnBox.SetSizePixel( aNewSize );
 aNewSize = GetSizePixel();
@@ -133,15 +152,18 @@ void SfxAlienWarningDialog::InitSize()
 SetSizePixel( aNewSize );
 }
 
-// align the size of the information text control (FixedText) to its 
content
+// resize + align the size of the information text control (FixedText) to 
its content
+aNewSize = m_aInfoText.GetSizePixel();
+aNewSize.Width() = nBtnsWidthSize - 4*IMPL_EXTRA_BUTTON_WIDTH;
+m_aInfoText.SetSizePixel( aNewSize );
 Size aMinSize = m_aInfoText.CalcMinimumSize( 
m_aInfoText.GetSizePixel().Width() );
 long nTxtH = aMinSize.Height();
 long nCtrlH = m_aInfoText.GetSizePixel().Height();
 long nDelta = ( nCtrlH - nTxtH );
-Size aNewSize = m_aInfoText.GetSizePixel();
 aNewSize.Height() -= nDelta;
 m_aInfoText.SetSizePixel( aNewSize );
 
+
 // new position for the succeeding windows
 Window* pWins[] =
 {
@@ -155,31 +177,17 @@ void SfxAlienWarningDialog::InitSize()
 (*pCurrent)-SetPosPixel( aNewPos );
 }
 
-// recalculate the size and position of the buttons
-m_aMoreInfoBtn.Hide();
-nTxtW = m_aKeepCurrentBtn.GetCtrlTextWidth( m_aKeepCurrentBtn.GetText() );
-nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
-aNewSize = m_aKeepCurrentBtn.GetSizePixel();
-aNewSize.Width() = nTxtW;
-m_aKeepCurrentBtn.SetSizePixel( aNewSize );
-Point aPos = m_aSaveODFBtn.GetPosPixel();
-aPos.X() = AW_COL_3 + nTxtW;
-m_aSaveODFBtn.SetPosPixel( aPos );
-nTxtW = m_aSaveODFBtn.GetCtrlTextWidth( m_aSaveODFBtn.GetText() );
-nTxtW += IMPL_EXTRA_BUTTON_WIDTH;
-aNewSize = m_aSaveODFBtn.GetSizePixel();
-aNewSize.Width() = nTxtW;
-m_aSaveODFBtn.SetSizePixel( aNewSize );
-
 // new size of the dialog
 aNewSize = GetSizePixel();
 aNewSize.Height() -= nDelta;
-if (aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH  aNewSize.Width())
-{
-aNewSize.Width() = aPos.X() + nTxtW + IMPL_EXTRA_BUTTON_WIDTH;
-}
+aNewSize.Width() = nBtnsWidthSize;
 SetSizePixel( aNewSize );
 
+// resize the FixedLine
+aNewSize = m_aOptionLine.GetSizePixel();
+aNewSize.Width() = GetSizePixel().Width();
+m_aOptionLine.SetSizePixel( aNewSize );
+
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
Libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source

[Andras Timar]

 scp2/source/xsltfilter/module_xsltfilter.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3654d261f25a46b908aa7a927699456a606e3eb3
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Feb 2 11:42:01 2012 +0100

Chose xslt filters for default install, not for minimal though

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

diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp 
b/scp2/source/xsltfilter/module_xsltfilter.scp
index 7854ce7..a3206b0 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.scp
+++ b/scp2/source/xsltfilter/module_xsltfilter.scp
@@ -45,6 +45,6 @@ Module gid_Module_Optional_Xsltfiltersamples
 gid_File_Xsl_Export_Xhtml_Table,
 gid_File_Share_Registry_Xsltfilter_Xcd );
 Minimal = NO;
-Default = NO;
+Default = YES;
 Styles = ( );
 End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 2 commits - sw/source

[Andras Timar]

 sw/source/ui/dialog/wordcountdialog.src  |2 ++
 sw/source/ui/dialog/wordcountwrapper.cxx |2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 5f261a0db51621fbab37cc0f991bc8c9106dda01
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 6 16:02:43 2012 +0100

fdo#45045 fox context sensitive help for Word Count dialog

diff --git a/sw/source/ui/dialog/wordcountdialog.src 
b/sw/source/ui/dialog/wordcountdialog.src
index 7c4a5f9..1b8b1a1 100644
--- a/sw/source/ui/dialog/wordcountdialog.src
+++ b/sw/source/ui/dialog/wordcountdialog.src
@@ -131,11 +131,13 @@ ModelessDialog DLG_WORDCOUNT
 };
 HelpButton  PB_HELP
 {
+HelpID = HID_DLG_WORDCOUNT ;
 Pos = MAP_APPFONT ( 5 , 114 ) ;
 Size = MAP_APPFONT ( 50 , 15 ) ;
 };
 OKButtonPB_OK
 {
+HelpID = HID_DLG_WORDCOUNT ;
 Pos = MAP_APPFONT ( 115 , 114 ) ;
 Size = MAP_APPFONT ( 50 , 15 ) ;
 DefButton = TRUE ;
commit 3db0da5c0bc11c989460aeb7a21ba973a76f3e29
Author: Andras Timar ati...@suse.com
Date:   Mon Feb 6 15:51:30 2012 +0100

typo

diff --git a/sw/source/ui/dialog/wordcountwrapper.cxx 
b/sw/source/ui/dialog/wordcountwrapper.cxx
index 9052448..63f262d 100644
--- a/sw/source/ui/dialog/wordcountwrapper.cxx
+++ b/sw/source/ui/dialog/wordcountwrapper.cxx
@@ -42,7 +42,7 @@ SwWordCountWrapper::SwWordCountWrapper(   Window 
*pParentWindow,
 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
 OSL_ENSURE(pFact, SwAbstractDialogFactory fail!);
 pAbstDlg = pFact-CreateSwWordCountDialog( DLG_WORDCOUNT, pBindings, this, 
pParentWindow, pInfo );
-OSL_ENSURE(pAbstDlg, Dialog contruction faiedl!);
+OSL_ENSURE(pAbstDlg, Dialog contruction failed!);
 pWindow = pAbstDlg-GetWindow();
 
 eChildAlignment = SFX_ALIGN_NOALIGNMENT;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cui/source

[Andras Timar]

 cui/source/options/optgdlg.hrc |3 +--
 cui/source/options/optgdlg.src |4 ++--
 cui/source/options/optsave.src |4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 537169e64f34353dab8c6dcacc088fba61729392
Author: Ivan Timofeev timofeev@gmail.com
Date:   Sun Feb 5 11:51:09 2012 +0400

fix various overlapped controls in the Options dialog

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

diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 5e54e0b..d870e29 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -64,8 +64,7 @@
 #define ROW11   (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
 #define ROW12   (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
 #define ROW13   (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW14   (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW15   (ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW14   (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE+6)
 
 #define DIFF(v1,v2) (v2-v1)
 #define OFFS_TEXTBOX_FIXEDTEXT(base)
(base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 730aa24..0e01fe0 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -188,7 +188,7 @@ TabPage OFA_TP_MISC
 };
 CheckBox CB_EXPERIMENTAL
 {
-Pos = MAP_APPFONT( COL1, ROW15 );
+Pos = MAP_APPFONT( COL1, ROW14 );
 Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
 Text [ en-US ] = Enable experimental (unstable) features;
 };
@@ -456,7 +456,7 @@ TabPage OFA_TP_VIEW
 {
 HelpID = cui:CheckBox:OFA_TP_VIEW:CB_SELECTION;
 Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - 
RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ;
-Size = MAP_APPFONT ( 118 - 34 , RSC_CD_CHECKBOX_HEIGHT ) ;
+Size = MAP_APPFONT ( 83 , RSC_CD_CHECKBOX_HEIGHT ) ;
 Text [ en-US ] = Transparency ;
 };
 
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index da94bd4..845336f 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -101,7 +101,7 @@ TabPage RID_SFXPAGE_SAVE
 {
 HelpID = cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 210 , 61 ) ;
+Pos = MAP_APPFONT ( 210 , 62 ) ;
 Size = MAP_APPFONT ( 21 , 12 ) ;
 Left = TRUE ;
 Repeat = TRUE ;
@@ -116,7 +116,7 @@ TabPage RID_SFXPAGE_SAVE
 };
 FixedText FT_MINUTE
 {
-Pos = MAP_APPFONT ( 234 , 63 ) ;
+Pos = MAP_APPFONT ( 234 , 64 ) ;
 Size = MAP_APPFONT ( 35 , 8 ) ;
 Text [ en-US ] = Minutes ;
 };
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: cui/source

[Andras Timar]

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

New commits:
commit 9a7f53cdcfb40820d7c7f29e2190fb1572611b91
Author: Andras Timar ati...@suse.com
Date:   Sun Feb 5 19:58:17 2012 +0100

fix coordinates on Options - Load/Save - General panel

diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 845336f..eafb980 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -94,14 +94,14 @@ TabPage RID_SFXPAGE_SAVE
 {
 HelpID = cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE;
 Pos = MAP_APPFONT ( 12 , 63 ) ;
-Size = MAP_APPFONT ( 193 , 10 ) ;
+Size = MAP_APPFONT ( 163 , 10 ) ;
 Text [ en-US ] = Save ~AutoRecovery information every ;
 };
 NumericField ED_AUTOSAVE
 {
 HelpID = cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 210 , 62 ) ;
+Pos = MAP_APPFONT ( 180 , 62 ) ;
 Size = MAP_APPFONT ( 21 , 12 ) ;
 Left = TRUE ;
 Repeat = TRUE ;
@@ -116,8 +116,8 @@ TabPage RID_SFXPAGE_SAVE
 };
 FixedText FT_MINUTE
 {
-Pos = MAP_APPFONT ( 234 , 64 ) ;
-Size = MAP_APPFONT ( 35 , 8 ) ;
+Pos = MAP_APPFONT ( 204 , 64 ) ;
+Size = MAP_APPFONT ( 65 , 8 ) ;
 Text [ en-US ] = Minutes ;
 };
 CheckBox BTN_RELATIVE_FSYS
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - readlicense_oo/docs

[Andras Timar]

 readlicense_oo/docs/readme/readme.xrm |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8727d28bc8bc54014371421404c33ae6d89d3e63
Author: Petr Mladek pmla...@suse.cz
Date:   Fri Feb 3 17:56:18 2012 +0100

update README section about desktop integration packages on Linux

The redhat-menus package has been obsoleted by freedesktop-menus.
The freedesktop-menus package should be usable on most other distros
these days.

Thanks Jean-Baptiste for noticing this.

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

diff --git a/readlicense_oo/docs/readme/readme.xrm 
b/readlicense_oo/docs/readme/readme.xrm
index 4e50f63..e4fd3ab 100755
--- a/readlicense_oo/docs/readme/readme.xrm
+++ b/readlicense_oo/docs/readme/readme.xrm
@@ -150,9 +150,10 @@
p id=rpminstall8 xml:lang=en-USThe above command 
does the first part of the installation process. To complete the process, you 
also need to install the desktop integration packages. To do this, change 
directory to the desktop-integration directory that is within the RPMS 
directory, using the following command:/p
p id=rpminstall9 xml:lang=en-UScd 
desktop-integration/p
p id=rpminstallA xml:lang=en-USNow run the 
installation command again:/p
-   p id=rpminstallB xml:lang=en-USFor Fedora-based 
systems: su -c 'yum install *redhat*.rpm'/p
+   p id=rpminstallB xml:lang=en-USFor Fedora-based 
systems: su -c 'yum install *freedesktop*.rpm'/p
p id=rpminstallC xml:lang=en-USFor Mandriva-based 
systems: sudo urpmi *mandriva*.rpm/p
-   p id=rpminstallD xml:lang=en-USFor other 
RPM-based systems (Suse, etc.): rpm -Uvh *suse*.rpm/p
+   p id=rpminstallF xml:lang=en-USFor SUSE-based 
systems: rpm -Uvh *suse*.rpm/p
+   p id=rpminstallD xml:lang=en-USFor other 
RPM-based systems: rpm -Uvh *freedesktop*.rpm/p
p id=rpminstallE xml:lang=en-USThe installation 
process is now completed, and you should have icons for all the ${PRODUCTNAME} 
applications in your desktop's Applications/Office menu./p
h3 id=sdfsdfgf42t2 xml:lang=en-USNotes Concerning 
Desktop Integration for Linux Distributions Not Covered in the Above 
Installation Instructions/h3
p id=otherinstall1 xml:lang=en-USIt should be 
easily possible to install ${PRODUCTNAME} on other Linux distributions not 
specifically covered in these installation instructions. The main aspect for 
which differences might be encountered is desktop integration./p
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - scp2/source

[Andras Timar]

 scp2/source/xsltfilter/module_xsltfilter.scp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0b2ab2969d50559b68055e564ca739abad5b6c8c
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Thu Feb 2 11:42:01 2012 +0100

Chose xslt filters for default install, not for minimal though

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

diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp 
b/scp2/source/xsltfilter/module_xsltfilter.scp
index 7854ce7..a3206b0 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.scp
+++ b/scp2/source/xsltfilter/module_xsltfilter.scp
@@ -45,6 +45,6 @@ Module gid_Module_Optional_Xsltfiltersamples
 gid_File_Xsl_Export_Xhtml_Table,
 gid_File_Share_Registry_Xsltfilter_Xcd );
 Minimal = NO;
-Default = NO;
+Default = YES;
 Styles = ( );
 End
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/win

[Andras Timar]

 vcl/win/source/app/salinst.cxx |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 56549a939cdf3a2510bbdba21b72632a4f238cf5
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 1 15:56:34 2012 +0100

ByteString - OUString

diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index d0a6bd0..d491404 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -87,16 +87,15 @@ void SalAbort( const rtl::OUString rErrorText, bool )
 
 if ( rErrorText.isEmpty() )
 {
-// #112255# make sure crash reporter is triggered
+// make sure crash reporter is triggered
 RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-FatalAppExit( 0, Application Error );
+FatalAppExitW( 0, LApplication Error );
 }
 else
 {
-// #112255# make sure crash reporter is triggered
+// make sure crash reporter is triggered
 RaiseException( 0, EXCEPTION_NONCONTINUABLE, 0, NULL );
-ByteString aErrorText( ImplSalGetWinAnsiString( rErrorText ) );
-FatalAppExit( 0, aErrorText.GetBuffer() );
+FatalAppExitW( 0, rErrorText.getStr() );
 }
 }
 
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/win

[Andras Timar]

 vcl/win/source/window/salframe.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit e1e8bd19a6acf5526f6bb3d9006ecb37ff01c89d
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 1 16:00:59 2012 +0100

kill ByteString by dropping support of Win9x

diff --git a/vcl/win/source/window/salframe.cxx 
b/vcl/win/source/window/salframe.cxx
index 6c8dce8..c21f95b 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1107,11 +1107,7 @@ void WinSalFrame::SetTitle( const rtl::OUString rTitle )
 {
 DBG_ASSERT( sizeof( WCHAR ) == sizeof( xub_Unicode ), 
WinSalFrame::SetTitle(): WCHAR != sal_Unicode );
 
-if ( !SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.getStr()) ) )
-{
-ByteString aAnsiTitle = ImplSalGetWinAnsiString( rTitle );
-SetWindowTextA( mhWnd, aAnsiTitle.GetBuffer() );
-}
+SetWindowTextW( mhWnd, reinterpret_castLPCWSTR(rTitle.getStr()) )
 }
 
 // ---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: vcl/inc vcl/win

[Andras Timar]

 vcl/inc/win/saldata.hxx|1 -
 vcl/win/source/app/saldata.cxx |   25 -
 2 files changed, 26 deletions(-)

New commits:
commit a31acd6b405777aa3ccb7298fabbe8b4aba55a32
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 1 16:14:19 2012 +0100

remove unused ImplSalGetWinAnsiString

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index cc3a9e4..a38a6f7 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -244,7 +244,6 @@ bool ImplIsFontAvailable( HDC hDC, const UniString rName );
 
 // \WIN\SOURCE\APP\SALDATA.CXX
 rtl_TextEncoding ImplSalGetSystemEncoding();
-rtl::OString ImplSalGetWinAnsiString( const UniString rStr, sal_Bool 
bFileName = FALSE );
 UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen = 
STRING_LEN );
 int ImplSalWICompareAscii( const wchar_t* pStr1, const char* pStr2 );
 
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index 854849f..4445315 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.cxx
@@ -53,31 +53,6 @@ rtl_TextEncoding ImplSalGetSystemEncoding()
 
 // ---
 
-rtl::OString ImplSalGetWinAnsiString( const UniString rStr, sal_Bool 
bFileName )
-{
-rtl_TextEncoding eEncoding = ImplSalGetSystemEncoding();
-if ( bFileName )
-{
-return rtl::OUStringToOString( rStr, eEncoding,
-   RTL_UNICODETOTEXT_FLAGS_UNDEFINED_UNDERLINE |
-   RTL_UNICODETOTEXT_FLAGS_INVALID_UNDERLINE |
-   RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |
-   RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACESTR |
-   RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 );
-}
-else
-{
-return rtl::OUStringToOString( rStr, eEncoding,
-   RTL_UNICODETOTEXT_FLAGS_UNDEFINED_DEFAULT |
-   RTL_UNICODETOTEXT_FLAGS_INVALID_DEFAULT |
-   RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACE |
-   RTL_UNICODETOTEXT_FLAGS_UNDEFINED_REPLACESTR |
-   RTL_UNICODETOTEXT_FLAGS_PRIVATE_MAPTO0 );
-}
-}
-
-// ---
-
 UniString ImplSalGetUniString( const sal_Char* pStr, xub_StrLen nLen )
 {
 return UniString( pStr, nLen, ImplSalGetSystemEncoding(),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: 3 commits - l10ntools/inc l10ntools/source

[Andras Timar]

 l10ntools/inc/gsicheck.hxx|5 -
 l10ntools/source/gsicheck.cxx |  178 +-
 2 files changed, 9 insertions(+), 174 deletions(-)

New commits:
commit d9adc4342cf275498e7d2e27a674116ceb2ac13f
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 1 18:45:27 2012 +0100

tweak help text of gsicheck tool

diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 42dc4fc..8d5544f 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -602,10 +602,7 @@ void Help()
 /*/
 {
 fprintf( stdout, \n );
-fprintf( stdout, gsicheck Version 1.9.0 (c)1999 - 2006 by SUN 
Microsystems\n );
-fprintf( stdout, 
=\n );
-fprintf( stdout, \n );
-fprintf( stdout, gsicheck checks the syntax of tags in GSI-Files and 
SDF-Files\n );
+fprintf( stdout, gsicheck checks the syntax of tags in SDF-Files\n );
 fprintf( stdout,  checks for inconsistencies and malicious UTF8 
encoding\n );
 fprintf( stdout,  checks tags in Online Help\n );
 fprintf( stdout,  relax GID/LID length to %s\n,
@@ -627,7 +624,7 @@ void Help()
 fprintf( stdout, -tCheck only Translation language(s). Should be used 
before merging.\n );
 fprintf( stdout, -edisable encoding checks. E.g.: double questionmark 
\'??\' which may be the\n );
 fprintf( stdout,   result of false conversions\n );
-fprintf( stdout, -lISO Languagecode or numerical 2 digits Identifier 
of the source language.\n );
+fprintf( stdout, -lISO language code of the source language.\n );
 fprintf( stdout,   Default is en-US. Use \\ (empty string) or 
'none'\n );
 fprintf( stdout,   to disable source language dependent checks\n );
 fprintf( stdout, -rReference filename to check that source language 
entries\n );
commit 7dfd1c4023db374bec747dff551ba1bcdafc6508
Author: Andras Timar ati...@suse.com
Date:   Wed Feb 1 17:46:13 2012 +0100

remove this KeyID check from gsicheck, unused

diff --git a/l10ntools/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index 7764e78..2915c69 100644
--- a/l10ntools/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.hxx
@@ -104,7 +104,6 @@ private:
 sal_Bool bCheckSourceLang;
 sal_Bool bCheckTranslationLang;
 sal_Bool bReference;
-sal_Bool bAllowKeyIDs;
 sal_Bool bAllowSuspicious;
 
 sal_Bool bHasBlockError;
@@ -114,7 +113,7 @@ private:
 sal_Bool HasSuspiciousChars( GSILine* pTestee, GSILine* pSource );
 
 public:
-GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool bTrans, 
sal_Bool bRef, sal_Bool bAllowKID, sal_Bool bAllowSusp );
+GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool bTrans, 
sal_Bool bRef, sal_Bool bAllowSusp );
 ~GSIBlock();
 void PrintMessage( ByteString aType, ByteString aMsg, ByteString aPrefix, 
ByteString aContext, sal_uLong nLine, ByteString aUniqueId = ByteString() );
 void PrintError( ByteString aMsg, ByteString aPrefix, ByteString aContext, 
sal_uLong nLine, ByteString aUniqueId = ByteString() );
diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index a49b1d6..42dc4fc 100644
--- a/l10ntools/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.cxx
@@ -226,7 +226,7 @@ void GSILine::ReassembleLine()
 // class GSIBlock
 //
 /*/
-GSIBlock::GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool 
bTrans, sal_Bool bRef, sal_Bool bAllowKID, sal_Bool bAllowSusp )
+GSIBlock::GSIBlock( sal_Bool PbPrintContext, sal_Bool bSource, sal_Bool 
bTrans, sal_Bool bRef, sal_Bool bAllowSusp )
 /*/
 : pSourceLine( NULL )
 , pReferenceLine( NULL )
@@ -234,7 +234,6 @@ GSIBlock::GSIBlock( sal_Bool PbPrintContext, sal_Bool 
bSource, sal_Bool bTrans,
 , bCheckSourceLang( bSource )
 , bCheckTranslationLang( bTrans )
 , bReference( bRef )
-, bAllowKeyIDs( bAllowKID )
 , bAllowSuspicious( bAllowSusp )
 , bHasBlockError( sal_False )
 {
@@ -360,93 +359,6 @@ sal_Bool GSIBlock::IsUTF8( const ByteString aTestee, 
sal_Bool bFixTags, sal_uIn
 aFixed.Erase();
 }
 
-if ( !bAllowKeyIDs )
-{
-sal_Bool bIsKeyID = sal_False;
-sal_Bool bNewId = sal_False;
-ByteString aID( aTestee );
-sal_uInt16 nAfterID = 0;
-
-if ( aTestee.Equals( {, 0, 2 ) )
-{   // check for strings from instset_native like 
{Tahoma8}335795.Installation Wiza ...
-sal_uInt16 nTagEnd = aTestee.Search( '}' );
-if ( nTagEnd != STRING_NOTFOUND )
-{
-if ( bFixTags )
-aFixed = aTestee.Copy( 0, nTagEnd+1

[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - sc/source

[Andras Timar]

 sc/source/ui/namedlg/namedefdlg.cxx |2 -
 sc/source/ui/src/namedefdlg.src |   56 ++--
 sc/source/ui/src/namedlg.src|   52 -
 3 files changed, 55 insertions(+), 55 deletions(-)

New commits:
commit 03e1564c1e306bcdcd6802d6ad09252e36cb51b5
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date:   Thu Jan 26 14:36:16 2012 +0100

Make named ranges dialog more consistent, localizable (I+II+III)

Signed-off-by: Petr Mladek pmla...@suse.cz
Signed-off-by: Noel Power nopo...@suse.com
Signed-off-by: Andras Timar ati...@suse.com

diff --git a/sc/source/ui/namedlg/namedefdlg.cxx 
b/sc/source/ui/namedlg/namedefdlg.cxx
index 9f87047..45c600b 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -345,7 +345,7 @@ void ScNameDefDlg::MorePushed()
 Size nSize = GetSizePixel();
 
 //depending on the state of the button, move all elements below up/down
-long nPixel = 75;
+long nPixel = 65;
 if (!maBtnMore.GetState())
 {
 nPixel *= -1;
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
index 42538dd..2bf1926 100644
--- a/sc/source/ui/src/namedefdlg.src
+++ b/sc/source/ui/src/namedefdlg.src
@@ -34,118 +34,118 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
 HelpId = CMD_FID_ADD_NAME ;
 Hide = TRUE ;
 SVLook = TRUE ;
-Size = MAP_APPFONT ( 200 , 120 ) ;
+Size = MAP_APPFONT ( 225 , 116 ) ;
 Text [ en-US ] = Define Name ;
 Moveable = TRUE ;
 Closeable = TRUE;
 PushButton BTN_ADD
 {
-Pos = MAP_APPFONT( 90, 100 );
+Pos = MAP_APPFONT( 115, 96 );
 Size = MAP_APPFONT( 50, 15 );
 TabStop = TRUE;
 Text [en-US] = Add;
 };
 PushButton BTN_CANCEL
 {
-Pos = MAP_APPFONT( 145, 100 );
+Pos = MAP_APPFONT( 170, 96 );
 Size = MAP_APPFONT ( 50, 15 );
 TabStop = TRUE;
 Text [en-US] = Cancel;
 };
 CheckBox BTN_MORE
 {
-Pos = MAP_APPFONT( 5, 82 );
+Pos = MAP_APPFONT( 5, 81 );
 Size = MAP_APPFONT( 80, 15 );
 Text [en-US] = Range Options;
 };
 FixedText FT_INFO
 {
 Pos = MAP_APPFONT( 5, 5 );
-Size = MAP_APPFONT( 180, 15 );
+Size = MAP_APPFONT( 215, 15 );
 };
 FixedText FT_NAME
 {
-Pos = MAP_APPFONT( 5, 25 );
-Size = MAP_APPFONT( 30, 15 );
+Pos = MAP_APPFONT( 5, 27 );
+Size = MAP_APPFONT( 50, 13 );
 Text [en-US] = Name;
 };
 FixedText FT_RANGE
 {
 Pos = MAP_APPFONT( 5, 45 );
-Size = MAP_APPFONT( 30, 15 );
+Size = MAP_APPFONT( 50, 13 );
 Text [en-US] = Range;
 };
 FixedText FT_SCOPE
 {
-Pos = MAP_APPFONT( 5, 65 );
-Size = MAP_APPFONT( 30, 15 );
+Pos = MAP_APPFONT( 5, 63 );
+Size = MAP_APPFONT( 50, 13 );
 Text [en-US] = Scope;
 };
 Edit ED_NAME
 {
 Border = TRUE;
-Pos = MAP_APPFONT( 40, 25 );
-Size = MAP_APPFONT( 155, 15 );
+Pos = MAP_APPFONT( 60, 25 );
+Size = MAP_APPFONT( 160, 13 );
 TabStop = TRUE;
 };
 Edit ED_RANGE
 {
 Border = TRUE;
-Pos = MAP_APPFONT( 40, 45 );
-Size = MAP_APPFONT( 140, 15 );
+Pos = MAP_APPFONT( 60, 43 );
+Size = MAP_APPFONT( 145, 13 );
 TabStop = TRUE;
 };
 ImageButton RB_RANGE
 {
-Pos = MAP_APPFONT ( 180 , 45 ) ;
-Size = MAP_APPFONT ( 15 , 15 ) ;
+Pos = MAP_APPFONT ( 205 , 43 ) ;
+Size = MAP_APPFONT ( 15 , 13 ) ;
 TabStop = TRUE ;
 QuickHelpText [ en-US ] = Shrink ;
 };
 CheckBox BTN_PRINTAREA
 {
 HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA;
-Pos = MAP_APPFONT ( 5 , 100 ) ;
-Size = MAP_APPFONT ( 80 , 15 ) ;
+Pos = MAP_APPFONT ( 5 , 94 ) ;
+Size = MAP_APPFONT ( 90 , 10 ) ;
 Text [ en-US ] = ~Print range ;
 TabStop = TRUE ;
 };
 CheckBox BTN_CRITERIA
 {
 HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA;
-Pos = MAP_APPFONT ( 5 , 120 ) ;
-Size = MAP_APPFONT ( 60 , 15 ) ;
+Pos = MAP_APPFONT ( 5 , 107 ) ;
+Size = MAP_APPFONT ( 70 , 10 ) ;
 Text [ en-US ] = ~Filter ;
 TabStop = TRUE ;
 };
 CheckBox BTN_ROWHEADER
 {
 HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER;
-Pos = MAP_APPFONT ( 110, 120 ) ;
-Size = MAP_APPFONT ( 82 , 15 ) ;
+Pos = MAP_APPFONT ( 120, 107 ) ;
+Size = MAP_APPFONT ( 92 , 10 ) ;
 Text [ en-US ] = Repeat ~row ;
 TabStop = TRUE ;
 };
 CheckBox BTN_COLHEADER
 {
 HelpID = sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER;
-Pos = MAP_APPFONT ( 110 , 100 ) ;
-Size = MAP_APPFONT ( 82 , 15 ) ;
+Pos = MAP_APPFONT ( 120 , 94 ) ;
+Size = MAP_APPFONT ( 92

[Libreoffice-commits] .: 5 commits - cli_ure/source odk/configure.pl odk/examples scp2/inc scp2/source

[Andras Timar]

 cli_ure/source/native/native_bootstrap.cxx |8 +-
 odk/configure.pl   |3 
 odk/examples/DevelopersGuide/examples.html |   40 ++---
 scp2/inc/macros.inc|   26 
 scp2/source/ooo/installation_ooo.scp   |1 
 scp2/source/winexplorerext/registryitem_winexplorerext.scp |   12 +--
 6 files changed, 44 insertions(+), 46 deletions(-)

New commits:
commit 797f19ffdaee125726d1db3d230f666093e4b5f8
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 31 16:41:48 2012 +0100

use LibreOffice instead of OpenOffice.org in registry

it may help to solve file association issues, especially when
OpenOffice.org is/was also installed

diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index c540495..0ceb511 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -356,7 +356,7 @@ End
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
 Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+Name = STRING(CONCAT2(LibreOffice.,name)); \
 Value =  ; \
 End
 
@@ -365,7 +365,7 @@ End
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
 Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
-Name = STRING(CONCAT2(OpenOffice.org.,name)); \
+Name = STRING(CONCAT2(LibreOffice.,name)); \
 Value =  ; \
 End
 
@@ -374,7 +374,7 @@ End
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = gid_Module_Root_Reg_##name; \
 Subkey = STRING(CONCAT2(.,key)); \
-Value = STRING(CONCAT2(OpenOffice.org.,name)); \
+Value = STRING(CONCAT2(LibreOffice.,name)); \
 ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
 End
 
@@ -382,7 +382,7 @@ End
 RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT2(OpenOffice.org.,name)); \
+Subkey = STRING(CONCAT2(LibreOffice.,name)); \
 REG_VALUE_LNG(disp_name) \
 End
 
@@ -390,7 +390,7 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\DefaultIcon)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\DefaultIcon)); \
 Value = progpath\program\soffice.bin, STRING(icon_id); \
 End
 
@@ -398,7 +398,7 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell)); \
 Value = STRING(default); \
 End
 
@@ -406,13 +406,13 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new)); \
 REG_VALUE_LNG(NEW) \
 End \
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\new\command)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\new\command)); \
 Value = \progpath\program\\ STRING(app) \ -n \%1\; \
 End
 
@@ -420,7 +420,7 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\open\command)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\open\command)); \
 Value = \progpath\program\\ STRING(app) \ -o \%1\; \
 End
 
@@ -428,7 +428,7 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\print\command)); \
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\print\command)); \
 Value = \progpath\program\\ STRING(app) \ -p \%1\; \
 End
 
@@ -436,7 +436,7 @@ End
 RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
 ModuleID = modid; \
-Subkey = STRING(CONCAT3(OpenOffice.org.,name,\shell\printto\command)); 
\
+Subkey = STRING(CONCAT3(LibreOffice.,name,\shell\printto\command)); \
 Value = \progpath\program\\ STRING(app) \ -pt \%2\ \%1\; \
 End
 
@@ -446,7 +446,7 @@ End

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - oox/source

[Andras Timar]

 oox/source/xls/workbookhelper.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 89e5c595d126b8d7da63b22a9819bc2000da87c1
Author: Kohei Yoshida kohei.yosh...@suse.com
Date:   Mon Jan 30 12:30:03 2012 -0500

Removed debug statement.

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

diff --git a/oox/source/xls/workbookhelper.cxx 
b/oox/source/xls/workbookhelper.cxx
index 3cc56cd..a9d9b5c 100644
--- a/oox/source/xls/workbookhelper.cxx
+++ b/oox/source/xls/workbookhelper.cxx
@@ -69,8 +69,6 @@
 #include oox/xls/workbooksettings.hxx
 #include oox/xls/worksheetbuffer.hxx
 
-#include iostream
-
 namespace oox {
 namespace xls {
 
@@ -394,7 +392,6 @@ Reference XNamedRange  
WorkbookGlobals::createLocalNamedRangeObject( OUString
 Reference XSpreadsheet  xSheet (xSheets-getByIndex(nTab), 
UNO_QUERY_THROW);
 Reference com::sun::star::container::XNamed  xNamed(xSheet, 
UNO_QUERY_THROW);
 rtl::OUString aName = xNamed-getName();
-std::cout  sheetName:   rtl::OUStringToOString( aName, 
RTL_TEXTENCODING_UTF8).getStr()  std::endl;
 PropertySet aSheetProps( xSheet );
 Reference XNamedRanges  xNamedRanges( aSheetProps.getAnyProperty( 
PROP_NamedRanges ), UNO_QUERY_THROW );
 Reference XNameAccess  xNameAccess( xNamedRanges, UNO_QUERY_THROW );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5-0' - 3 commits - officecfg/registry

[Andras Timar]

 officecfg/registry/data/org/openoffice/VCL.xcu |   40 ++---
 1 file changed, 10 insertions(+), 30 deletions(-)

New commits:
commit 08fd53e77ac1c7d2b6fe09bcf1a7af866c5c4610
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 24 19:01:44 2012 +0100

remove bn-IN node, we have bn
(cherry picked from commit 9b55eeba78d4e6418750a12c3dad4b42e2dd3f03)

Signed-off-by: Caolán McNamara caol...@redhat.com
Signed-off-by: Andras Timar ati...@suse.com

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 3f26f43..32ffec3 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -856,26 +856,6 @@
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=bn-IN oor:op=replace
-  prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
-  /prop
-  prop oor:name=CTL_DISPLAY oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_HEADING oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_PRESENTATION oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_SPREADSHEET oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_TEXT oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-/node
 node oor:name=hi oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial 
Unicode MS;Lucida Sans Unicode;clearlyU/value
commit c32b0147e04e31983af694926a4630ff557dd117
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date:   Tue Jan 24 16:22:15 2012 +0100

Fix build: dupplicate node/prop /VCL/DefaultFonts/bn
(cherry picked from commit 86bf32c487852f4e466b27320e3724266cb53dba)

Signed-off-by: Caolán McNamara caol...@redhat.com
Signed-off-by: Andras Timar ati...@suse.com

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 8b779cc..3f26f43 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -856,7 +856,7 @@
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=bn oor:op=replace
+node oor:name=bn-IN oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
commit 3fab2eda05007f73a901c6571f5451399121e1df
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 24 14:56:35 2012 +0100

country code 'IN' is not in use for these locales fdo#44208, fdo#45107
(cherry picked from commit 82e0266b05dd53d0ce8b12bd5c76ae25872b87a9)

Signed-off-by: Caolán McNamara caol...@redhat.com
Signed-off-by: Andras Timar ati...@suse.com

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 9a14e02..8b779cc 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -836,7 +836,7 @@
 valueLohit Nepali;Kalimati;Samanata;Sans/value
   /prop
 /node
-node oor:name=as-IN oor:op=replace
+node oor:name=as oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale 
Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -856,7 +856,7 @@
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=bn-IN oor:op=replace
+node oor:name=bn oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -876,7 +876,7 @@
 valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=hi-IN oor:op=replace
+node oor:name=hi oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial 
Unicode MS;Lucida Sans Unicode;clearlyU/value

[Libreoffice-commits] .: officecfg/registry

[Andras Timar]

 officecfg/registry/data/org/openoffice/VCL.xcu |   22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 82e0266b05dd53d0ce8b12bd5c76ae25872b87a9
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 24 14:56:35 2012 +0100

country code 'IN' is not in use for these locales fdo#44208, fdo#45107

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index d4d5f0b..248e439 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -836,7 +836,7 @@
 valueLohit Nepali;Kalimati;Samanata;Sans/value
   /prop
 /node
-node oor:name=as-IN oor:op=replace
+node oor:name=as oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale 
Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -856,7 +856,7 @@
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=bn-IN oor:op=replace
+node oor:name=bn oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -876,7 +876,7 @@
 valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=hi-IN oor:op=replace
+node oor:name=hi oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial 
Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -896,7 +896,7 @@
 valueLohit Hindi;Mangal;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=gu-IN oor:op=replace
+node oor:name=gu oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode 
MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -916,7 +916,7 @@
 valueLohit Gujarati;Shruti;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=kn-IN oor:op=replace
+node oor:name=kn oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode 
MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -936,7 +936,7 @@
 valueLohit Kannada;Tunga;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=mai-IN oor:op=replace
+node oor:name=mai oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Maithili;Tahoma;Lucidasans;Lucida Sans;Supplement;Andale 
Sans UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -956,7 +956,7 @@
 valueLohit Maithili;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=ml-IN oor:op=replace
+node oor:name=ml oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueAnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida 
Sans;Supplement;Andale Sans UI;Arial Unicode MS;Lucida Sans 
Unicode;clearlyU/value
   /prop
@@ -976,7 +976,7 @@
 valueAnjaliOldLipi;Lohit Malayalam;Meera;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS/value
   /prop
 /node
-node oor:name=mr-IN oor:op=replace
+node oor:name=mr oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Marathi;Tahoma;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -996,7 +996,7 @@
 valueLohit Marathi;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=or-IN oor:op=replace
+node oor:name=or oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueutkal;Kalinga;Lohit Oriya;Samyak Oriya;Tahoma;Lucidasans;Lucida 
Sans;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
   /prop
@@ -1036,7 +1036,7 @@
 valueRaavi;Lohit Punjabi;Saab;Tahoma;Lucidasans;Lucida Sans;Arial 
Unicode MS/value
   /prop
 /node
-node oor:name=ta-IN oor:op=replace
+node oor:name=ta oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Tamil;Latha;Sans Serif/value
   /prop
@@ -1056,7 +1056,7 @@
 valueLohit Tamil;Latha;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=te-IN oor:op=replace
+node oor:name=te oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Telugu;Gautami;Lucidasans;Lucida Sans;Arial Unicode 
MS;Lucida Sans Unicode;clearlyU/value
   /prop

[Libreoffice-commits] .: officecfg/registry

[Andras Timar]

 officecfg/registry/data/org/openoffice/VCL.xcu |   20 
 1 file changed, 20 deletions(-)

New commits:
commit 9b55eeba78d4e6418750a12c3dad4b42e2dd3f03
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 24 19:01:44 2012 +0100

remove bn-IN node, we have bn

diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu 
b/officecfg/registry/data/org/openoffice/VCL.xcu
index 6cf60ef..be7b42e 100644
--- a/officecfg/registry/data/org/openoffice/VCL.xcu
+++ b/officecfg/registry/data/org/openoffice/VCL.xcu
@@ -856,26 +856,6 @@
 valueLohit Assamese;Tahoma;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
   /prop
 /node
-node oor:name=bn-IN oor:op=replace
-  prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Andale Sans 
UI;Arial Unicode MS;Lucida Sans Unicode;clearlyU/value
-  /prop
-  prop oor:name=CTL_DISPLAY oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_HEADING oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_PRESENTATION oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_SPREADSHEET oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-  prop oor:name=CTL_TEXT oor:op=replace oor:type=xs:string
-valueLohit Bengali;Vrinda;Lucidasans;Lucida Sans;Arial Unicode 
MS/value
-  /prop
-/node
 node oor:name=hi oor:op=replace
   prop oor:name=UI_SANS oor:op=replace oor:type=xs:string
 valueLohit Hindi;Mangal;Lucidasans;Lucida Sans;Andale Sans UI;Arial 
Unicode MS;Lucida Sans Unicode;clearlyU/value
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: dictionaries/ru_RU

[Andras Timar]

 dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties |   30 +++
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 0329fd247e20bd3e9aa7d7943dfd5574fc60544a
Author: Andras Timar ati...@suse.com
Date:   Tue Jan 24 08:03:22 2012 +0100

fix double utf8 encoding

diff --git a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties 
b/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties
index 20e78c2..d7df847 100644
--- a/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties
+++ b/dictionaries/ru_RU/dialog/ru_RU_ru_RU.properties
@@ -1,15 +1,15 @@
-abbreviation=\u0420\u0452\u0420\u00b1\u0420\u00b1\u0421\u0402\u0420\u00b5\u0420\u0406\u0420\u0451\u0420\u00b0\u0421\u201a\u0421\u0453\u0421\u0402\u0421\u2039
-grammar=\u0420\u201c\u0421\u0402\u0420\u00b0\u0420\u0458\u0420\u0458\u0420\u00b0\u0421\u201a\u0420\u0451\u0420\u0454\u0420\u00b0
-hyphen=\u0420\u201d\u0420\u00b5\u0421\u201e\u0420\u0451\u0421\u0403
-comma=\u0420\u045f\u0421\u0453\u0420\u0405\u0420\u0454\u0421\u201a\u0421\u0453\u0420\u00b0\u0421\u2020\u0420\u0451\u0421\u040f
-common=\u0420\u045b\u0420\u00b1\u0421\u2030\u0420\u0451\u0420\u00b5 
\u0420\u0455\u0421\u20ac\u0420\u0451\u0420\u00b1\u0420\u0454\u0420\u0451
-multiword=\u0420\u040e\u0420\u00bb\u0420\u0455\u0420\u0406\u0420\u0455\u0421\u0403\u0420\u0455\u0421\u2021\u0420\u00b5\u0421\u201a\u0420\u00b0\u0420\u0405\u0420\u0451\u0421\u040f
-together=\u0420\u040e\u0420\u00bb\u0420\u0451\u0421\u201a\u0420\u0405\u0420\u0455/\u0421\u0402\u0420\u00b0\u0420\u00b7\u0420\u0491\u0420\u00b5\u0420\u00bb\u0421\u040a\u0420\u0405\u0420\u0455
-proofreading=\u0420\u040e\u0421\u201a\u0420\u0451\u0420\u00bb\u0420\u0451\u0421\u0403\u0421\u201a\u0420\u0451\u0420\u0454\u0420\u00b0
-space=\u0420\u045f\u0421\u0402\u0420\u0455\u0420\u00b1\u0420\u00b5\u0420\u00bb
-typographica=\u0420\u045e\u0420\u0451\u0420\u0457\u0420\u0455\u0420\u0456\u0421\u0402\u0420\u00b0\u0421\u201e\u0420\u0451\u0420\u0454\u0420\u00b0
-dup=\u0420\u045f\u0420\u0455\u0420\u0406\u0421\u201a\u0420\u0455\u0421\u0402 
\u0421\u0403\u0420\u00bb\u0420\u0455\u0420\u0406 \u0420\u0406 
\u0421\u0403\u0420\u00bb\u0420\u0455\u0420\u0406\u0420\u0455\u0421\u0403\u0420\u0455\u0421\u2021\u0420\u00b5\u0421\u201a\u0420\u00b0\u0420\u0405\u0420\u0451\u0421\u040f\u0421\u2026
-dup2=\u0420\u045f\u0420\u0455\u0420\u0406\u0421\u201a\u0420\u0455\u0421\u0402 
\u0421\u0403\u0420\u00bb\u0420\u0455\u0420\u0406 \u0420\u0406 
\u0420\u0457\u0421\u0402\u0420\u00b5\u0420\u0491\u0420\u00bb\u0420\u0455\u0420\u00b6\u0420\u00b5\u0420\u0405\u0420\u0451\u0421\u040f\u0421\u2026
-others=\u0420\u045f\u0421\u0402\u0420\u0455\u0421\u2021\u0420\u00b5\u0420\u00b5
-numsep=\u0420\u00a0\u0420\u00b0\u0420\u00b7\u0420\u0491\u0420\u00b5\u0420\u00bb\u0420\u0451\u0421\u201a\u0420\u00b5\u0420\u00bb\u0420\u0451
 \u0420\u0456\u0421\u0402\u0421\u0453\u0420\u0457\u0420\u0457 
\u0421\u0402\u0420\u00b0\u0420\u00b7\u0421\u0402\u0421\u040f\u0420\u0491\u0420\u0455\u0420\u0406
 (ISO) \u0420\u0491\u0420\u00bb\u0421\u040f 
\u0421\u2021\u0420\u0451\u0421\u0403\u0420\u00b5\u0420\u00bb
-quotation=\u0420\u0459\u0420\u00b0\u0420\u0406\u0421\u2039\u0421\u2021\u0420\u0454\u0420\u0451
+abbreviation=\u0410\u0431\u0431\u0440\u0435\u0432\u0438\u0430\u0442\u0443\u0440\u044b
+grammar=\u0413\u0440\u0430\u043c\u043c\u0430\u0442\u0438\u043a\u0430
+hyphen=\u0414\u0435\u0444\u0438\u0441
+comma=\u041f\u0443\u043d\u043a\u0442\u0443\u0430\u0446\u0438\u044f
+common=\u041e\u0431\u0449\u0438\u0435 \u043e\u0448\u0438\u0431\u043a\u0438
+multiword=\u0421\u043b\u043e\u0432\u043e\u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u044f
+together=\u0421\u043b\u0438\u0442\u043d\u043e/\u0440\u0430\u0437\u0434\u0435\u043b\u044c\u043d\u043e
+proofreading=\u0421\u0442\u0438\u043b\u0438\u0441\u0442\u0438\u043a\u0430
+space=\u041f\u0440\u043e\u0431\u0435\u043b
+typographica=\u0422\u0438\u043f\u043e\u0433\u0440\u0430\u0444\u0438\u043a\u0430
+dup=\u041f\u043e\u0432\u0442\u043e\u0440 \u0441\u043b\u043e\u0432 \u0432 
\u0441\u043b\u043e\u0432\u043e\u0441\u043e\u0447\u0435\u0442\u0430\u043d\u0438\u044f\u0445
+dup2=\u041f\u043e\u0432\u0442\u043e\u0440 \u0441\u043b\u043e\u0432 \u0432 
\u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u044f\u0445
+others=\u041f\u0440\u043e\u0447\u0435\u0435
+numsep=\u0420\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435\u043b\u0438 
\u0433\u0440\u0443\u043f\u043f \u0440\u0430\u0437\u0440\u044f\u0434\u043e\u0432 
(ISO) \u0434\u043b\u044f \u0447\u0438\u0441\u0435\u043b
+quotation=\u041a\u0430\u0432\u044b\u0447\u043a\u0438
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - cui/source

[Andras Timar]

 cui/source/tabpages/tabarea.src |  205 
 1 file changed, 148 insertions(+), 57 deletions(-)

New commits:
commit 4039f725e784031ebb8370da74cc5c2f9f55bb64
Author: David Tardon dtar...@redhat.com
Date:   Fri Jan 20 10:32:42 2012 +0100

add missing semicolons. *blush*

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

diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index 6c830d0..fe22673 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -1001,14 +1001,14 @@ TabPage RID_SVXPAGE_BITMAP
 File = sc05502.bmp ;
 };
 };
-}
+};
 CheckBox BTN_EMBED
 {
HelpID = cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_EMBED;
 Pos = MAP_APPFONT ( 197 , 124 ) ;
 Size = MAP_APPFONT ( 122 , 10 ) ;
 Text [ en-US ] =  Embed;
-}
+};
 };
 
 // --
commit 1651cbac6bf5b1523db0c06df2146059c4d968c3
Author: David Tardon dtar...@redhat.com
Date:   Fri Jan 20 09:41:59 2012 +0100

make these strings localizable again (fdo#44947)

Our translation tools read the src files literally, line by line, only
reacting on specific patterns (e.g., 'Text [en-US] = ...;'). Therefore
use of macros like this cannot work.

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

diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index b1117b1..6c830d0 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -682,51 +682,6 @@ TabPage RID_SVXPAGE_SHADOW
 };
 };
 
-// Helper for creating the load / save / embed buttons in std. positions
-
-#define LOAD_BUTTON(hid,qhtxt) \
-ImageButton BTN_LOAD \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 197 , 104  ) ; \
-Size = MAP_APPFONT ( 16 , 16 ) ; \
-TabStop = TRUE ; \
-QuickHelpText [ en-US ] = qhtxt ; \
-ButtonImage = Image \
-{ \
-ImageBitmap = Bitmap \
-{ \
-File = sc05501.bmp ; \
-}; \
-}; \
-} \
-
-#define SAVE_BUTTON(hid,qhtxt) \
-ImageButton BTN_SAVE \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 217 , 104  ) ; \
-Size = MAP_APPFONT ( 16 , 16 ) ; \
-TabStop = TRUE ; \
-QuickHelpText [ en-US ] = qhtxt ; \
-ButtonImage = Image \
-{ \
-ImageBitmap = Bitmap \
-{ \
-File = sc05502.bmp ; \
-}; \
-}; \
-}
-
-#define EMBED_BUTTON(hid,txt) \
-CheckBox BTN_EMBED \
-{ \
-   HelpID = hid ; \
-Pos = MAP_APPFONT ( 197 , 124 ) ; \
-Size = MAP_APPFONT ( 122 , 10 ) ; \
-Text [ en-US ] = txt ; \
-}
-
 // --
 TabPage RID_SVXPAGE_HATCH
 {
@@ -868,9 +823,43 @@ TabPage RID_SVXPAGE_HATCH
 TabStop = TRUE ;
 };
 
-LOAD_BUTTON( cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD, Load Hatches 
List );
-SAVE_BUTTON( cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE, Save Hatches 
List );
-EMBED_BUTTON( cui:ImageButton:RID_SVXPAGE_HATCH:BTN_EMBED, Embed );
+ImageButton BTN_LOAD
+{
+   HelpID = cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD;
+Pos = MAP_APPFONT ( 197 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = Load Hatches List;
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = sc05501.bmp ;
+};
+};
+};
+ImageButton BTN_SAVE
+{
+   HelpID = cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE;
+Pos = MAP_APPFONT ( 217 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = Save Hatches List;
+ButtonImage = Image
+{
+ImageBitmap = Bitmap
+{
+File = sc05502.bmp ;
+};
+};
+};
+CheckBox BTN_EMBED
+{
+   HelpID = cui:ImageButton:RID_SVXPAGE_HATCH:BTN_EMBED;
+Pos = MAP_APPFONT ( 197 , 124 ) ;
+Size = MAP_APPFONT ( 122 , 10 ) ;
+Text [ en-US ] = Embed;
+};
 };
 
 // --
@@ -983,9 +972,43 @@ TabPage RID_SVXPAGE_BITMAP
 TabStop = TRUE ;
 };
 
-LOAD_BUTTON( cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD, Load Bitmap 
List );
-SAVE_BUTTON( cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE, Save Bitmap 
List );
-EMBED_BUTTON( cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_EMBED, Embed );
+ImageButton BTN_LOAD
+{
+   HelpID = cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD;
+Pos = MAP_APPFONT ( 197 , 104  ) ;
+Size = MAP_APPFONT ( 16 , 16 ) ;
+TabStop = TRUE ;
+QuickHelpText [ en-US ] = Load Bitmap List

[Libreoffice-commits] .: solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/windows/msiglobal.pm |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 5d2f27834abd9ea13556387ffa7f773587edbebc
Author: Andras Timar ati...@suse.com
Date:   Thu Jan 19 23:22:38 2012 +0100

fdo#44915 MSI installer l10n bug

Unfortunately msiinfo.exe has a limitation, it truncates Language
property in Summary Information at char position 254.
The replacement, WiLangId.vbs does not have this limitation.

diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm 
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 8b8007a..a097780 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -982,14 +982,11 @@ sub create_transforms
 
 my $msitran = msitran.exe;# Has to be in the path
 my $msidb = msidb.exe;# Has to be in the path
-my $msiinfo = msiinfo.exe;# Has to be in the path
+my $wilangid = $ENV{WINDOWS_SDK_HOME} . 
/Samples/SysMgmt/Msi/scripts/WiLangId.vbs;
 
 my $from = cwd();
 
-my $architecture = Intel;
-if (( $allvariableshashref-{'64BITPRODUCT'} )  ( 
$allvariableshashref-{'64BITPRODUCT'} == 1 )) { $architecture = x64; }
-
-my $templatevalue = \ . $architecture . ;1033;
+my $templatevalue = 1033;
 
 $installdir = installer::converter::make_path_conform($installdir);
 
@@ -1124,8 +1121,7 @@ sub create_transforms
 }
 }
 
-$templatevalue = $templatevalue . \; # adding 
ending ''
-$systemcall = $msiinfo .   . $basedbname .  -p  . $templatevalue;
+$systemcall = cscript.exe  . $wilangid .   . $basedbname .  Package  
. $templatevalue;
 
 $returnvalue = system($systemcall);
 
@@ -1134,12 +1130,12 @@ sub create_transforms
 
 if ($returnvalue)
 {
-$infoline = ERROR: Could not execute $msiinfo!\n;
+$infoline = ERROR: Could not execute WiLangId.vbs!\n;
 push( @installer::globals::logfileinfo, $infoline);
 }
 else
 {
-$infoline = Success: Executed $msiinfo successfully!\n;
+$infoline = Success: Executed WiLangId.vbs successfully!\n;
 push( @installer::globals::logfileinfo, $infoline);
 }
 }
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] .: desktop/Executable_soffice.bin.mk desktop/Module_desktop.mk desktop/util desktop/WinResTarget_sofficebin.mk desktop/WinResTarget_soffice.mk officecfg/registry reportbuilder/re

[Andras Timar]

 desktop/Executable_soffice.bin.mk  
  |2 
 desktop/Module_desktop.mk  
  |1 
 desktop/WinResTarget_soffice.mk
  |2 
 desktop/WinResTarget_sofficebin.mk 
  |   49 ++
 desktop/util/officeloader.rc   
  |   36 +--
 officecfg/registry/data/org/openoffice/Setup.xcu   
  |   22 ++--
 reportbuilder/registry/data/org/openoffice/Setup.xcu   
  |2 
 scp2/inc/macros.inc
  |2 
 scp2/source/base/registryitem_base.scp 
  |2 
 scp2/source/binfilter/registryitem_binfilter.scp   
  |   16 +--
 scp2/source/calc/registryitem_calc.scp 
  |   26 ++---
 scp2/source/draw/registryitem_draw.scp 
  |   12 +-
 scp2/source/impress/registryitem_impress.scp   
  |   28 ++---
 scp2/source/math/registryitem_math.scp 
  |8 -
 scp2/source/ooo/registryitem_ooo.scp   
  |4 
 scp2/source/writer/registryitem_writer.scp 
  |   32 +++---
 
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.cxx
 |   17 +--
 
setup_native/source/win32/customactions/reg4msdoc/registrationcontextinformation.hxx
 |1 
 setup_native/source/win32/customactions/shellextensions/startmenuicon.cxx  
  |4 
 sfx2/source/appl/shutdowniconunx.cxx   
  |6 -
 sfx2/source/appl/shutdowniconw32.cxx   
  |   18 +--
 vcl/inc/svids.hrc  
  |8 -
 vcl/inc/vcl/syswin.hxx 
  |   16 +--
 vcl/unx/generic/window/salframe.cxx
  |2 
 24 files changed, 166 insertions(+), 150 deletions(-)

New commits:
commit ceb14e0143fb72b34421f6fb81ff1fb1842cb500
Author: Andras Timar ati...@suse.com
Date:   Wed Jan 18 13:11:11 2012 +0100

fdo#37740 remove duplicate icons from soffice.bin/soffice.exe

diff --git a/desktop/Executable_soffice.bin.mk 
b/desktop/Executable_soffice.bin.mk
index 8815432..00fb005 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -103,6 +103,6 @@ $(eval $(call gb_Executable_set_ldflags,\
 
 endif
 
-$(eval $(call gb_Executable_add_nativeres,$(sofficebin),soffice/src)) 
+$(eval $(call gb_Executable_add_nativeres,$(sofficebin),sofficebin/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 3d0045c..eb83f82 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -98,6 +98,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
 WinResTarget_sdraw \
 WinResTarget_simpress \
 WinResTarget_soffice \
+WinResTarget_sofficebin \
 WinResTarget_smath \
 WinResTarget_sweb \
 WinResTarget_swriter \
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index b15..fe66aa5 100644
--- a/desktop/WinResTarget_soffice.mk
+++ b/desktop/WinResTarget_soffice.mk
@@ -44,6 +44,6 @@ $(eval $(call gb_WinResTarget_add_dependency,soffice/src,\
 sysui/desktop/icons/main_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_add_file,soffice/src,desktop/util/officeloader))
+$(eval $(call 
gb_WinResTarget_add_file,soffice/src,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/WinResTarget_sofficebin.mk 
b/desktop/WinResTarget_sofficebin.mk
new file mode 100644
index 000..334c9b7
--- /dev/null
+++ b/desktop/WinResTarget_sofficebin.mk
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the License); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an AS IS basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., David Tardon dtar...@redhat.com
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository

[Libreoffice-commits] .: sc/source

[Andras Timar]

 sc/source/ui/optdlg/tpdefaults.cxx |   11 +++
 sc/source/ui/src/optdlg.src|4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 225647779959d24cfdaea62968f518cc52533a90
Author: Andras Timar ati...@suse.com
Date:   Wed Jan 18 23:48:43 2012 +0100

fdo#44896 accomodate localized text expansion

diff --git a/sc/source/ui/optdlg/tpdefaults.cxx 
b/sc/source/ui/optdlg/tpdefaults.cxx
index bd1cc68..afced22 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -50,6 +50,17 @@ ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, 
const SfxItemSet rCor
 rCoreAttrs.Get(GetWhich(SID_SCDOCOPTIONS)));
 mpLocalOptions.reset(new ScDocOptions(rItem.GetDocOptions()));
 
+long nTxtW = aFtNSheets.GetCtrlTextWidth( aFtNSheets.GetText() );
+long nCtrlW = aFtNSheets.GetSizePixel().Width();
+if ( nTxtW = nCtrlW )
+{
+Size aNewSize = aFtNSheets.GetSizePixel();
+aNewSize.Width() += ( nTxtW - nCtrlW );
+aFtNSheets.SetSizePixel( aNewSize );
+Point aNewPoint = aEdNSheets.GetPosPixel();
+aNewPoint.X() += ( nTxtW - nCtrlW );
+aEdNSheets.SetPosPixel( aNewPoint );
+}
 aEdNSheets.SetModifyHdl( LINK(this, ScTpDefaultsOptions, NumModifiedHdl) );
 }
 
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index a8f82a5..8012628 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -926,14 +926,14 @@ TabPage RID_SCPAGE_DEFAULTS
 FixedText FT_NSHEETS
 {
 Pos = MAP_APPFONT ( 12 , 16 ) ;
-Size = MAP_APPFONT ( 120 , 8 ) ;
+Size = MAP_APPFONT ( 110 , 8 ) ;
 Text [ en-US ] = Number of worksheets in new document;
 };
 NumericField ED_NSHEETS
 {
 HelpID = sc:NumericField:RID_SCPAGE_CALC:ED_NSHEETS;
 Border = TRUE ;
-Pos = MAP_APPFONT ( 150 , 14 ) ;
+Pos = MAP_APPFONT ( 130 , 14 ) ;
 Size = MAP_APPFONT ( 25 , 12 ) ;
 Minimum = 1 ;
 Maximum = 32000 ;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits