[Libreoffice-commits] .: Branch 'update' - check.php
check.php | 20
1 file changed, 12 insertions(+), 8 deletions(-)
New commits:
commit a4fe558d36097424601467b310ab83cb39f623cb
Author: Jan Holesovsky ke...@suse.cz
Date: Thu May 3 09:50:26 2012 +0200
3.5.3 RC2 is Final, update everything earlier to that.
diff --git a/check.php b/check.php
index e1bff93..f27d870 100644
--- a/check.php
+++ b/check.php
@@ -109,8 +109,12 @@ $update_versions = array(
# 3.5.2 versions
'1488b14-519dc6f-43021d0-52136ea-8d338cc' = 'LO-3.5', # 3.5.2 RC1
-# To be uncommented when 3.5.3 Final is out
-#'281b639-6baa1d3-ef66a77-d866f25-f36d45f' = 'LO-3.5', # 3.5.2 RC2 /
Final
+'281b639-6baa1d3-ef66a77-d866f25-f36d45f' = 'LO-3.5', # 3.5.2 RC2 / Final
+
+# 3.5.3 versions
+'21cb047-d7e6025-9ba54fc-b4a51a8-f42372b' = 'LO-3.5', # 3.5.3 RC1
+# To be uncommented when 3.5.4 Final is out
+#'235ab8a-3802056-4a8fed3-2d66ea8-e241b80' = 'LO-3.5', # 3.5.3 RC2 /
Final
);
# Descriptions of the target versions
@@ -118,16 +122,16 @@ $update_versions = array(
# 'gitid' is the content of program/versionrc:buildid of the newest version
# 'id' is what is going to be shown in the update information dialog
$update_map = array(
-'LO-3.5' = array('gitid' =
'281b639-6baa1d3-ef66a77-d866f25-f36d45f',
- 'id' = 'LibreOffice 3.5.2',
- 'version' = '3.5.2',
+'LO-3.5' = array('gitid' =
'235ab8a-3802056-4a8fed3-2d66ea8-e241b80',
+ 'id' = 'LibreOffice 3.5.3',
+ 'version' = '3.5.3',
'update_type' = 'text/html',
'update_src' = 'http://www.libreoffice.org/download/'),
-# To be uncommented when 3.5.3 RC2 is out, to get updates from 3.5.3 RC1
+# To be uncommented when 3.5.4 RC2 is out, to get updates from 3.5.4 RC1
#'LO-3.5-pre' = array('gitid' = '',
-# 'id' = 'LibreOffice 3.5.3 RC2',
-# 'version' = '3.5.3 RC2',
+# 'id' = 'LibreOffice 3.5.4 RC2',
+# 'version' = '3.5.4 RC2',
# 'update_type' = 'text/html',
# 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: bug/bug.xhtml
bug/bug.xhtml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ff2462fa7f5a6c95e830c3b71a3d48a5200e77c7 Author: Jan Holesovsky ke...@suse.cz Date: Fri Apr 20 16:43:37 2012 +0200 Fix the URL when the user does has JavaScript disabled. diff --git a/bug/bug.xhtml b/bug/bug.xhtml index c0f017b..cc780e9 100644 --- a/bug/bug.xhtml +++ b/bug/bug.xhtml @@ -40,7 +40,7 @@ div class=message unsupportedThis browser version is not supported and this page cannot be displayed properly./div div class=message nojavascriptJavaScript is disabled and this page cannot be displayed./div div class=message -pPlease use a href=/enter_bug.cgi?product=LibreOffice;bug_status=UNCONFIRMED;version=?bugzilla/a instead to report a problem./p +pPlease use a href=http://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice;bug_status=UNCONFIRMED;version=?;bugzilla/a instead to report a problem./p pIt works on all browsers and when JavaScript is disabled./p /div div class=eyecandy/div ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: svx/source
svx/source/tbxctrls/tbunosearchcontrollers.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c6ec7ed43b0861e1c96d62aa75b594b1dd81e315
Author: Jan Holesovsky ke...@suse.cz
Date: Sun Apr 15 12:43:27 2012 +0200
findbar: Allow F3 to search next when in the find combobox.
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index de6f161..4e63eef 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -157,7 +157,7 @@ long FindTextFieldControl::PreNotify( NotifyEvent rNEvt )
}
}
-if ( KEY_RETURN == nCode || (bMod1 (KEY_G == nCode)) )
+if ( KEY_RETURN == nCode || (bMod1 (KEY_G == nCode)) || (KEY_F3
== nCode) )
{
Remember_Impl(GetText());
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - filter/Executable_svg2odf.mk filter/inc filter/Library_svgfilter.mk filter/Module_filter.mk filter/source framework/source Repository.mk
Repository.mk |1 filter/Executable_svg2odf.mk | 47 filter/Library_svgfilter.mk |5 ++ filter/Module_filter.mk |1 filter/inc/filter/dllapi.h| 49 ++ filter/source/svg/svgreader.hxx |6 ++- framework/source/uielement/toolbarmanager.cxx | 22 +-- 7 files changed, 110 insertions(+), 21 deletions(-) New commits: commit 2a63c47b5b60551d44ee20983fd422d502e29be4 Author: Jan Holesovsky ke...@suse.cz Date: Sat Apr 14 15:35:12 2012 +0200 Build svg2odf tool to be able to test the svg import. diff --git a/Repository.mk b/Repository.mk index e46f6b1..f0c5965 100644 --- a/Repository.mk +++ b/Repository.mk @@ -47,6 +47,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \ saxparser \ so_checksum \ sp2bv \ +svg2odf \ svidl \ typesconfig \ xml2cmp \ diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk new file mode 100644 index 000..794edb9 --- /dev/null +++ b/filter/Executable_svg2odf.mk @@ -0,0 +1,47 @@ +# -*- 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 Jan Holesovsky ke...@suse.cz, SUSE +# (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the GPLv3+), or +# the GNU Lesser General Public License Version 3 or later (the LGPLv3+), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Executable_Executable,svg2odf)) + +$(eval $(call gb_Executable_set_targettype_gui,svg2odf,YES)) + +$(eval $(call gb_Executable_use_api,svg2odf,\ +offapi \ +udkapi \ +)) + +$(eval $(call gb_Executable_use_libraries,svg2odf,\ +svgfilter \ +$(gb_STDLIBS) \ +)) + +$(eval $(call gb_Executable_add_cxxobjects,svg2odf,\ +filter/source/svg/test/svg2odf \ +filter/source/svg/test/odfserializer \ +)) + +# vim: set ts=4 sw=4 et: diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk index b5ebe23..c37938f 100644 --- a/filter/Library_svgfilter.mk +++ b/filter/Library_svgfilter.mk @@ -27,6 +27,11 @@ $(eval $(call gb_Library_add_defs,svgfilter,\ -DUSE_MODERN_SPIRIT \ )) +$(eval $(call gb_Library_set_include,svgfilter,\ +$$(INCLUDE) \ +-I$(SRCDIR)/filter/inc \ +)) + $(eval $(call gb_Library_use_api,svgfilter,\ udkapi \ offapi \ diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 9bcfe3b..03f13e2 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_targets,filter,\ AllLangResTarget_xsltdlg \ Configuration_filter \ CustomTarget_svg \ + Executable_svg2odf \ Library_PptImporter \ Library_egi \ Library_eme \ diff --git a/filter/inc/filter/dllapi.h b/filter/inc/filter/dllapi.h new file mode 100644 index 000..16ff305 --- /dev/null +++ b/filter/inc/filter/dllapi.h @@ -0,0 +1,49 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * http://www.openoffice.org/license.html + * for a copy of the LGPLv3
[Libreoffice-commits] .: filter/Module_filter.mk
filter/Module_filter.mk |1 - 1 file changed, 1 deletion(-) New commits: commit c0a3ff4ad85a3ecdc6b8589c3a8b3c19f199b02e Author: Jan Holesovsky ke...@suse.cz Date: Sat Apr 14 15:50:03 2012 +0200 Temporarily disable the build of svg2odf. diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 03f13e2..9bcfe3b 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_targets,filter,\ AllLangResTarget_xsltdlg \ Configuration_filter \ CustomTarget_svg \ - Executable_svg2odf \ Library_PptImporter \ Library_egi \ Library_eme \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/Executable_svg2odf.mk filter/Module_filter.mk
filter/Executable_svg2odf.mk |5 + filter/Module_filter.mk |1 + 2 files changed, 6 insertions(+) New commits: commit 3c0f54a41a63cd0a56cfa0faf40605c5b27dd99e Author: Jan Holesovsky ke...@suse.cz Date: Sat Apr 14 16:03:10 2012 +0200 Make svg2odf really build :-) diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk index 794edb9..f902dba 100644 --- a/filter/Executable_svg2odf.mk +++ b/filter/Executable_svg2odf.mk @@ -34,6 +34,11 @@ $(eval $(call gb_Executable_use_api,svg2odf,\ udkapi \ )) +$(eval $(call gb_Executable_set_include,svg2odf,\ +$$(INCLUDE) \ +-I$(SRCDIR)/filter/inc \ +)) + $(eval $(call gb_Executable_use_libraries,svg2odf,\ svgfilter \ $(gb_STDLIBS) \ diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk index 9bcfe3b..03f13e2 100644 --- a/filter/Module_filter.mk +++ b/filter/Module_filter.mk @@ -27,6 +27,7 @@ $(eval $(call gb_Module_add_targets,filter,\ AllLangResTarget_xsltdlg \ Configuration_filter \ CustomTarget_svg \ + Executable_svg2odf \ Library_PptImporter \ Library_egi \ Library_eme \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/Executable_svg2odf.mk
filter/Executable_svg2odf.mk | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) New commits: commit a167ce5d91f87326093cbcdb44cde1527ef6849c Author: Chr. Rossmanith chr.rossman...@gmx.de Date: Sat Apr 14 16:18:32 2012 +0200 gbuild for svg2odf diff --git a/filter/Executable_svg2odf.mk b/filter/Executable_svg2odf.mk index f902dba..329ca8e 100644 --- a/filter/Executable_svg2odf.mk +++ b/filter/Executable_svg2odf.mk @@ -41,7 +41,21 @@ $(eval $(call gb_Executable_set_include,svg2odf,\ $(eval $(call gb_Executable_use_libraries,svg2odf,\ svgfilter \ -$(gb_STDLIBS) \ + svxcore \ + editeng \ + xo \ + svt \ + vcl \ + svl \ + utl \ + tl \ + sax \ + comphelper \ + basegfx \ + cppuhelper \ + cppu \ + sal \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Executable_add_cxxobjects,svg2odf,\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - sd/source
sd/source/ui/slidesorter/controller/SlsClipboard.cxx| 11
sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx | 49 +---
sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx |1
sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx |1
sd/source/ui/slidesorter/inc/view/SlsTheme.hxx | 51 +---
sd/source/ui/slidesorter/view/SlsButtonBar.cxx | 141
sd/source/ui/slidesorter/view/SlsLayouter.cxx |5
sd/source/ui/slidesorter/view/SlsPageObjectLayouter.cxx |3
sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx |1
sd/source/ui/slidesorter/view/SlsTheme.cxx | 66 -
sd/source/ui/slidesorter/view/SlsToolTip.cxx|2
11 files changed, 90 insertions(+), 241 deletions(-)
New commits:
commit 227113bbf16f2feda4d3e41bb9aff7dc100ede17
Author: Jan Holesovsky ke...@suse.cz
Date: Sat Apr 14 21:46:14 2012 +0200
Slidesorter: Kill more useless cruft.
diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
index afdf133..ec3ea1d 100644
--- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx
@@ -35,6 +35,7 @@
#include model/SlsPageDescriptor.hxx
#include model/SlsPageEnumerationProvider.hxx
#include view/SlideSorterView.hxx
+#include view/SlsResource.hrc
#include view/SlsTheme.hxx
#include controller/SlideSorterController.hxx
#include controller/SlsInsertionIndicatorHandler.hxx
@@ -120,17 +121,16 @@ class Clipboard::UndoContext
public:
UndoContext (
SdDrawDocument* pDocument,
-const ::boost::shared_ptrViewShell rpMainViewShell,
-const ::boost::shared_ptrview::Theme rpTheme)
+const ::boost::shared_ptrViewShell rpMainViewShell)
: mpDocument(pDocument),
mpMainViewShell(rpMainViewShell)
{
if (mpDocument!=NULL mpDocument-IsUndoEnabled())
{
if (mpMainViewShell mpMainViewShell-GetShellType() ==
ViewShell::ST_DRAW)
-
mpDocument-BegUndo(rpTheme-GetString(view::Theme::String_DragAndDropPages));
+
mpDocument-BegUndo(String(SdResId(STRING_DRAG_AND_DROP_PAGES)));
else
-
mpDocument-BegUndo(rpTheme-GetString(view::Theme::String_DragAndDropSlides));
+
mpDocument-BegUndo(String(SdResId(STRING_DRAG_AND_DROP_SLIDES)));
}
}
@@ -714,8 +714,7 @@ sal_Int8 Clipboard::ExecuteDrop (
// Handle a general drop operation.
mpUndoContext.reset(new UndoContext (
mrSlideSorter.GetModel().GetDocument(),
-
mrSlideSorter.GetViewShell()-GetViewShellBase().GetMainViewShell(),
-mrSlideSorter.GetTheme()));
+
mrSlideSorter.GetViewShell()-GetViewShellBase().GetMainViewShell()));
mpSelectionObserverContext.reset(new
SelectionObserver::Context(mrSlideSorter));
HandlePageDrop(*pDragTransferable);
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
index 51c7157..ca45f8b 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx
@@ -96,7 +96,6 @@ private:
Bitmap maMouseOverBackground;
Bitmap maMouseOverFocusedBackground;
Bitmap maMouseOverSelectedAndFocusedBackground;
-::rtl::OUString msUnhideString;
ButtonBar mrButtonBar;
Size maSize;
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index 7e00ef3..2d60385 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -164,19 +164,6 @@ public:
};
const BitmapEx GetIcon (const IconType eType);
-enum StringType
-{
-String_Unhide,
-String_DragAndDropPages,
-String_DragAndDropSlides,
-String_Command1,
-String_Command2,
-String_Command2B,
-String_Command3,
-_StringType_Size_
-};
-::rtl::OUString GetString (const StringType eType) const;
-
private:
bool mbIsHighContrastMode;
class GradientDescriptor
@@ -202,7 +189,6 @@ private:
::std::vectorGradientDescriptor maGradients;
::std::vectorBitmapEx maIcons;
::std::vectorColorData maColor;
-::std::vectorrtl::OUString maStrings;
GradientDescriptor GetGradient (const GradientColorType eType);
/** Guarded initialization of the specified icon in the maIcons
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index afe64c9..28c5a26 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -30,6 +30,7
[Libreoffice-commits] .: sfx2/source sw/source xmloff/source
sfx2/source/doc/sfxbasemodel.cxx| 13 -
sw/source/core/swg/SwXMLTextBlocks1.cxx |2 +-
xmloff/source/meta/xmlversion.cxx |2 +-
3 files changed, 6 insertions(+), 11 deletions(-)
New commits:
commit 1ae4c87367d1719a100b61eb694a7a186d2e8d6b
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Apr 10 12:40:00 2012 +0200
char[] - const char[].
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 5ec029e..02a4b9a 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -3402,17 +3402,12 @@ uno::Reference ui::XUIConfigurationManager SAL_CALL
SfxBaseModel::getUIConfig
{
SfxObjectShell* pObjShell =
SfxBaseModel::GetObjectShell();
-char aNum[] =
private:resource/toolbar/custom_OOo1x_0;
-char aTitle[] = Toolbar 0;
-sal_Int32 nNumIndex = strlen( aNum )-1;
-sal_Int32 nTitleIndex = strlen( aTitle )-1;
+rtl::OUString aNum(
private:resource/toolbar/custom_OOo1x_ );
+rtl::OUString aTitle( Toolbar );
for ( sal_Int32 i = 0; i rToolbars.getLength(); i++ )
{
-aNum[nNumIndex]++;
-aTitle[nTitleIndex]++;
-
-rtl::OUString aCustomTbxName(
RTL_CONSTASCII_USTRINGPARAM( aNum ));
-rtl::OUString aCustomTbxTitle(
RTL_CONSTASCII_USTRINGPARAM( aTitle ));
+rtl::OUString aCustomTbxName = aNum +
rtl::OUString::valueOf( i + 1 );
+rtl::OUString aCustomTbxTitle = aTitle +
rtl::OUString::valueOf( i + 1 );
uno::Reference container::XIndexContainer
xToolbar = rToolbars[i];
ConvertSlotsToCommands( pObjShell, xToolbar );
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx
b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 62a2494..3a20eb8 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -50,7 +50,7 @@
#define STREAM_STGREAD ( STREAM_READ | STREAM_SHARE_DENYWRITE |
STREAM_NOCREATE )
#define STREAM_STGWRITE ( STREAM_READ | STREAM_WRITE | STREAM_SHARE_DENYWRITE )
-sal_Char XMLN_BLOCKLIST[] = BlockList.xml;
+const char XMLN_BLOCKLIST[] = BlockList.xml;
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/xmloff/source/meta/xmlversion.cxx
b/xmloff/source/meta/xmlversion.cxx
index 9b2cb9d..3940fdd 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -48,7 +48,7 @@ using ::rtl::OUString;
//
-sal_Char XMLN_VERSIONSLIST[] = VersionList.xml;
+const char XMLN_VERSIONSLIST[] = VersionList.xml;
//
// #110897#
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'update' - check.php
check.php | 19 +--
1 file changed, 5 insertions(+), 14 deletions(-)
New commits:
commit 6c0d90ff343b0e7d5c294d53c20e3b1424d95849
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Apr 6 08:05:15 2012 +0200
3.5.2 RC2 is Final, update everything earlier to that.
diff --git a/check.php b/check.php
index 3b5ad78..e1bff93 100644
--- a/check.php
+++ b/check.php
@@ -105,12 +105,10 @@ $update_versions = array(
# 3.5.1 versions
'45a2874-aa8c38d-dff3b9c-def3dbd-62463c8' = 'LO-3.5', # 3.5.1 RC1
-# To be uncommented when 3.5.2 Final is out
-#'dc9775d-05ecbee-0851ad3-1586698-727bf66' = 'LO-3.5', # 3.5.1 RC2 /
Final
+'dc9775d-05ecbee-0851ad3-1586698-727bf66' = 'LO-3.5', # 3.5.1 RC2 / Final
# 3.5.2 versions
-# -pre to be deleted when 3.5.2 Final is out
-'1488b14-519dc6f-43021d0-52136ea-8d338cc' = 'LO-3.5-pre', # 3.5.2 RC1
+'1488b14-519dc6f-43021d0-52136ea-8d338cc' = 'LO-3.5', # 3.5.2 RC1
# To be uncommented when 3.5.3 Final is out
#'281b639-6baa1d3-ef66a77-d866f25-f36d45f' = 'LO-3.5', # 3.5.2 RC2 /
Final
);
@@ -120,19 +118,12 @@ $update_versions = array(
# 'gitid' is the content of program/versionrc:buildid of the newest version
# 'id' is what is going to be shown in the update information dialog
$update_map = array(
-'LO-3.5' = array('gitid' =
'dc9775d-05ecbee-0851ad3-1586698-727bf66',
- 'id' = 'LibreOffice 3.5.1',
- 'version' = '3.5.1',
+'LO-3.5' = array('gitid' =
'281b639-6baa1d3-ef66a77-d866f25-f36d45f',
+ 'id' = 'LibreOffice 3.5.2',
+ 'version' = '3.5.2',
'update_type' = 'text/html',
'update_src' = 'http://www.libreoffice.org/download/'),
-# To be removed when 3.5.2 RC2 becomes Final
-'LO-3.5-pre' = array('gitid' =
'281b639-6baa1d3-ef66a77-d866f25-f36d45f',
- 'id' = 'LibreOffice 3.5.2 RC2',
- 'version' = '3.5.2 RC2',
- 'update_type' = 'text/html',
- 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
-
# To be uncommented when 3.5.3 RC2 is out, to get updates from 3.5.3 RC1
#'LO-3.5-pre' = array('gitid' = '',
# 'id' = 'LibreOffice 3.5.3 RC2',
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: avmedia/source basegfx/source canvas/source cui/source dbaccess/source editeng/source filter/source framework/source odk/examples sdext/source sd/source svtools/source svx/sou
avmedia/source/gstreamer/gstframegrabber.cxx |2 +- avmedia/source/gstreamer/gstmanager.cxx |2 +- avmedia/source/gstreamer/gstplayer.cxx |2 +- avmedia/source/gstreamer/gstwindow.cxx |2 +- avmedia/source/win/framegrabber.cxx |2 +- avmedia/source/win/manager.cxx |2 +- avmedia/source/win/player.cxx |2 +- avmedia/source/win/window.cxx |2 +- basegfx/source/tools/unopolypolygon.cxx |2 +- canvas/source/cairo/cairo_canvasbitmap.cxx |2 +- canvas/source/cairo/cairo_canvascustomsprite.cxx |2 +- canvas/source/cairo/cairo_canvasfont.cxx |2 +- canvas/source/cairo/cairo_textlayout.cxx |2 +- canvas/source/directx/dx_canvasbitmap.cxx |2 +- canvas/source/directx/dx_canvascustomsprite.cxx |2 +- canvas/source/directx/dx_canvasfont.cxx |2 +- canvas/source/directx/dx_textlayout.cxx |2 +- canvas/source/null/null_canvasbitmap.cxx |2 +- canvas/source/null/null_canvascustomsprite.cxx |2 +- canvas/source/null/null_canvasfont.cxx |2 +- canvas/source/null/null_textlayout.cxx |2 +- canvas/source/tools/cachedprimitivebase.cxx |2 +- canvas/source/tools/parametricpolypolygon.cxx |2 +- canvas/source/vcl/canvasbitmap.cxx |2 +- canvas/source/vcl/canvascustomsprite.cxx |2 +- canvas/source/vcl/canvasfont.cxx |2 +- canvas/source/vcl/textlayout.cxx |2 +- cui/source/dialogs/colorpicker.cxx |2 +- dbaccess/source/ui/misc/WCopyTable.cxx |2 +- editeng/source/uno/unonrule.cxx |4 ++-- filter/source/filtertracer/filtertracer.cxx |2 +- filter/source/flash/swffilter.cxx |2 +- filter/source/msfilter/powerpoint/pptimporter.cxx |2 +- filter/source/pdf/pdffilter.cxx |2 +- filter/source/pdf/pdfinteract.cxx |2 +- filter/source/placeware/filter.cxx |2 +- filter/source/xmlfilterdetect/filterdetect.cxx |2 +- framework/source/lomenubar/DesktopJob.cxx |2 +- framework/source/lomenubar/FrameJob.cxx |2 +- odk/examples/DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx |2 +- odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx |2 +- odk/examples/cpp/complextoolbarcontrols/MyJob.cxx |2 +- sd/source/filter/html/HtmlOptionsDialog.cxx |2 +- sd/source/ui/unoidl/unomodel.cxx |8 sdext/source/minimizer/pppoptimizer.cxx |2 +- sdext/source/minimizer/pppoptimizerdialog.cxx
[Libreoffice-commits] .: sal/qa sal/textenc sal/workben
sal/qa/osl/process/osl_Thread.cxx| 22 +++
sal/qa/rtl_strings/rtl_old_testostring.cxx |1
sal/textenc/tcvtmb.cxx | 26 -
sal/workben/clipboardwben/testcopy/cbcpytest.cxx | 61 ++---
sal/workben/clipboardwben/testpaste/cbptest.cxx | 65 ++-
sal/workben/clipboardwben/testviewer/cbvtest.cxx | 57 +---
sal/workben/testpipe.cxx | 20 +++
7 files changed, 121 insertions(+), 131 deletions(-)
New commits:
commit 8307fe9f65ef6011014d75041b3ddbc90d421b6a
Author: Mark Wolf mark.wolf.mu...@gmail.com
Date: Wed Apr 4 17:35:53 2012 -0400
Translated German comments to English in folder 'sal'.
sal/qa/rtl_strings/rtl_old_testostring.cxx contains some German comments
still
but the code itself uses test strings in German. When the test strings
appear
in the comments, they were left unchanged to maintain consistency.
Mark Wolf
diff --git a/sal/qa/osl/process/osl_Thread.cxx
b/sal/qa/osl/process/osl_Thread.cxx
index 47aa9ee..65b2943 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -70,23 +70,23 @@ using namespace osl;
using ::rtl::OString;
//
-
-// Kleine Stopuhr
+// Small stopwatch
class StopWatch {
-TimeValue t1,t2;// Start und Stopzeit
+TimeValue t1,t2;// Start and stoptime
protected:
sal_Int32 m_nNanoSec;
sal_Int32 m_nSeconds;
-bool m_bIsValid; // TRUE, wenn gestartet
und gestoppt
-bool m_bIsRunning; // TRUE, wenn gestartet.
+bool m_bIsValid; // TRUE, when started
and stopped
+bool m_bIsRunning; // TRUE, when started
public:
StopWatch();
~StopWatch() {}
-void start(); // Startet Timer
-void stop(); // Stoppt Timer
+void start(); // Starts time
+void stop(); // Stops time
double getSeconds() const;
double getTenthSec() const;
@@ -94,7 +94,7 @@ public:
// = Stop Watch
=
-// Eine kleine Stop-Uhr fuer den internen Gebrauch.
+// A small stopwatch for internal use
// (c) Lars Langhans 29.12.1996 22:10
StopWatch::StopWatch():m_bIsValid(false),m_bIsRunning(false) {}
@@ -116,12 +116,12 @@ void StopWatch::stop()
// pre: Timer should be started
// post: Timer will stopped
-// gettimeofday(t2, 0); // Timer ausfragen
+// gettimeofday(t2, 0); // Ask timer
osl_getSystemTime( t2 );
t_print(# %u %u nsecs\n, (unsigned) t2.Seconds, (unsigned) t2.Nanosec);
if (m_bIsRunning)
-{// check ob gestartet.
+{// check if started.
m_nSeconds = static_castsal_Int32(t2.Seconds) -
static_castsal_Int32(t1.Seconds);
if ( t2.Nanosec t1.Nanosec )
m_nNanoSec = static_castsal_Int32(t2.Nanosec) -
static_castsal_Int32(t1.Nanosec);
@@ -143,8 +143,8 @@ void StopWatch::stop()
double StopWatch::getSeconds() const
{
-// pre: gueltig = TRUE
-// BACK: Zeit in Sekunden.
+// pre: valid = TRUE
+// BACK: time in seconds
double nValue = 0.0;
if (m_bIsValid)
diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx
b/sal/qa/rtl_strings/rtl_old_testostring.cxx
index 70fca4d..435b428 100644
--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx
@@ -80,7 +80,6 @@ void oldtests::test_OString()
TEST_ENSURE( s2.lastIndexOf('M') == 0, test_OString error 10);
TEST_ENSURE( s2.lastIndexOf('t', s2.getLength() - 8) == 8, test_OString
error 9);
-
// Mein erster RTL OString ist ein String aus der RTL Library\n
// ||||||||||||
// Index0510 15 20 25 30 35 40 45 50 55
diff --git a/sal/textenc/tcvtmb.cxx b/sal/textenc/tcvtmb.cxx
index cea7cda..c696c84 100644
--- a/sal/textenc/tcvtmb.cxx
+++ b/sal/textenc/tcvtmb.cxx
@@ -160,13 +160,12 @@ sal_Size ImplDBCSToUnicode( const void* pData,
SAL_UNUSED_PARAMETER void*,
if ( !cConv )
{
-/* Wir vergleichen den kompletten Trailbereich den wir */
-/* definieren, der normalerweise groesser sein kann als */
-/* der definierte. Dies machen wir, damit Erweiterungen
von */
-/* uns nicht beruecksichtigten Encodings so weit wie */
-/* moeglich auch richtig zu behandeln, das double
[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy
oox/inc/oox/dump/dumperbase.hxx | 18 --
oox/inc/oox/dump/oledumper.hxx | 21 ---
oox/source/dump/dumperbase.cxx | 107 -
oox/source/dump/oledumper.cxx | 114
unusedcode.easy | 17 -
5 files changed, 277 deletions(-)
New commits:
commit 07ff032c805835355ff0dff75b8ad534dfb770e9
Author: Petr Vorel petr.vo...@gmail.com
Date: Mon Apr 2 11:40:06 2012 +0200
remove unused code (oox)
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 7f18220..a099886 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -395,7 +395,6 @@ public:
// token list -
static void appendToken( ::rtl::OUStringBuffer rStr, const
::rtl::OUString rToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
-static void appendToken( ::rtl::OUStringBuffer rStr, sal_Int64
nToken, sal_Unicode cSep = OOX_DUMP_LISTSEP );
static void appendIndex( ::rtl::OUStringBuffer rStr, const
::rtl::OUString rIdx );
static void appendIndex( ::rtl::OUStringBuffer rStr, sal_Int64
nIdx );
@@ -1074,9 +1073,6 @@ public:
voidwriteColRowRange( sal_Int32 nColRow1, sal_Int32
nColRow2 );
voidwriteColRange( sal_Int32 nCol1, sal_Int32 nCol2 );
voidwriteRowRange( sal_Int32 nRow1, sal_Int32 nRow2 );
-voidwriteAddress( const Address rPos );
-voidwriteRange( const Range rRange );
-voidwriteRangeList( const RangeList rRanges );
template typename Type
inline void writeDec( Type nData, sal_Int32 nWidth = 0,
sal_Unicode cFill = ' ' )
@@ -1349,17 +1345,6 @@ protected:
voidwriteArrayItem( const String rName, const sal_uInt8*
pnData, sal_Size nSize, sal_Unicode cSep = OOX_DUMP_LISTSEP );
voidwriteDateTimeItem( const String rName, const
::com::sun::star::util::DateTime rDateTime );
voidwriteGuidItem( const String rName, const
::rtl::OUString rGuid );
-voidwriteColIndexItem( const String rName, sal_Int32 nCol
);
-voidwriteRowIndexItem( const String rName, sal_Int32 nRow
);
-voidwriteColRangeItem( const String rName, sal_Int32
nCol1, sal_Int32 nCol2 );
-voidwriteRowRangeItem( const String rName, sal_Int32
nRow1, sal_Int32 nRow2 );
-voidwriteAddressItem( const String rName, const Address
rPos );
-voidwriteRangeItem( const String rName, const Range
rRange );
-voidwriteRangeListItem( const String rName, const
RangeList rRanges );
-voidwriteTokenAddressItem( const String rName, const
TokenAddress rPos, bool bNameMode );
-voidwriteTokenAddress3dItem( const String rName, const
::rtl::OUString rRef, const TokenAddress rPos, bool bNameMode );
-voidwriteTokenRangeItem( const String rName, const
TokenRange rRange, bool bNameMode );
-voidwriteTokenRange3dItem( const String rName, const
::rtl::OUString rRef, const TokenRange rRange, bool bNameMode );
template typename Type
voidaddNameToItem( Type nData, const NameListWrapper
rListWrp );
@@ -1753,9 +1738,6 @@ protected:
const OutputObjectBase rParent,
const BinaryInputStreamRef rxStrm,
rtl_TextEncoding eTextEnc );
-voidconstruct(
-const InputObjectBase rParent,
-rtl_TextEncoding eTextEnc );
virtual boolimplIsValid() const;
virtual voidimplDump();
diff --git a/oox/inc/oox/dump/oledumper.hxx b/oox/inc/oox/dump/oledumper.hxx
index 4d3ceaa..64d3d5c 100644
--- a/oox/inc/oox/dump/oledumper.hxx
+++ b/oox/inc/oox/dump/oledumper.hxx
@@ -84,27 +84,6 @@ protected:
};
//
-
-class StdHlinkObject : public OleInputObjectBase
-{
-public:
-explicitStdHlinkObject( const InputObjectBase rParent );
-
-protected:
-virtual voidimplDump();
-
-private:
-::rtl::OUString dumpHyperlinkString( const String rName, bool
bUnicode );
-
-booldumpGuidAndMoniker();
-voiddumpUrlMoniker();
-voiddumpFileMoniker();
-voiddumpItemMoniker();
-voiddumpAntiMoniker();
-voiddumpCompositeMoniker();
-};
-
-//
//
class OleStreamObject : public OleInputObjectBase
[Libreoffice-commits] .: sw/source
sw/source/core/layout/flowfrm.cxx | 455 ++
1 file changed, 225 insertions(+), 230 deletions(-)
New commits:
commit c3b72f69e093d79a1b263964633fe2ddfaef2e45
Author: David Vogt david.v...@adfinis-sygroup.ch
Date: Wed Apr 4 09:42:32 2012 +0200
Translated source comments from german
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 1aacdbc..ed88edc 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -145,9 +145,9 @@ sal_Bool SwFlowFrm::HasLockedFollow() const
sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
{
-//Wenn der Vorgaenger das KeepAttribut traegt und auch dessen
-//Vorgaenger usw. bis zum ersten der Kette und fuer diesen das
-//IsFwdMoveAllowed ein sal_False liefert, so ist das Moven eben nicht
erlaubt.
+// If all the predecessors up to the first of the chain have
+// the 'keep' attribute set, and the first of the chain's
+// IsFwdMoveAllowed returns sal_False, then we're not allowed to move.
SwFrm *pFrm = rThis;
if ( !pFrm-IsInFtn() )
do
@@ -157,7 +157,7 @@ sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
return sal_True;
} while ( pFrm );
- //Siehe IsFwdMoveAllowed()
+ //See IsFwdMoveAllowed()
sal_Bool bRet = sal_False;
if ( pFrm pFrm-GetIndPrev() )
bRet = sal_True;
@@ -173,8 +173,8 @@ sal_Bool SwFlowFrm::IsKeepFwdMoveAllowed()
void SwFlowFrm::CheckKeep()
{
-//Den 'letzten' Vorgaenger mit KeepAttribut anstossen, denn
-//die ganze Truppe koennte zuruckrutschen.
+// Kick off the last predecessor with a 'keep' attribute, because
+// it's possible for the whole troop to move back.
SwFrm *pPre = rThis.GetIndPrev();
if( pPre-IsSctFrm() )
{
@@ -308,31 +308,33 @@ sal_Bool SwFlowFrm::IsKeep( const SwAttrSet rAttrs, bool
bCheckIfLastRowShouldK
sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm *pPage, const SwRect
rRect )
{
-// Der return-Wert entscheidet mit,
-// ob auf Zurueckgeflossen werden muss, (3)
-// ob das gute alte WouldFit gerufen werden kann (0, 1)
-// oder ob ein Umhaengen und eine Probeformatierung sinnvoll ist (2)
-// dabei bedeutet Bit 1, dass Objekte an mir selbst verankert sind
-// und Bit 2, dass ich anderen Objekten ausweichen muss.
-
-//Wenn ein SurroundObj, dass einen Umfluss wuenscht mit dem Rect ueberlappt
-//ist der Fluss notwendig (weil die Verhaeltnisse nicht geschaetzt werden
-//koennen), es kann allerdings ggf. eine TestFormatierung stattfinden.
-//Wenn das SurroundObj ein Fly ist und ich selbst ein Lower bin oder der
Fly
-//Lower von mir ist, so spielt er keine Rolle.
-//Wenn das SurroundObj in einem zeichengebunden Fly verankert ist, und ich
-//selbst nicht Lower dieses Zeichengebundenen Flys bin, so spielt der Fly
-//keine Rolle.
-//#32639# Wenn das Objekt bei mir verankert ist kann ich es
-//vernachlaessigen, weil es hoechstwahrscheinlich (!?) mitfliesst,
-//eine TestFormatierung ist dann allerdings nicht erlaubt!
+// The return value helps deciding whether we need to flow back (3),
+// or whether we can use the good old WouldFit (0, 1), or if
+// it's reasonable to relocate and test-format (2).
+//
+// Bit 1 in this case means that there are objects anchored to myself,
+// bit 2 means that I have to avoid other objects.
+
+// If a SurroundObj that desires to be wrapped around overlaps with the
Rect,
+// it's required to float (because we can't guess the relationships).
+// However it's possible for a test formatting to happen.
+//
+// If the SurroundObj is a Fly and I'm a Lower, or the Fly is a lower of
+// mine, then it doesn't matter.
+//
+// If the SurroundObj is anchored in a character bound Fly, and I'm not
+// a Lower of that character bound Fly myself, then the Fly doesn't matter.
+
+//#32639# If the object is anchored with me, i can neglect it, because
+//it's likely that it will follow the flow. A test formatting is not
+//allowed in that case, however!
sal_uInt8 nRet = 0;
SwFlowFrm *pTmp = this;
do
-{ // Wenn an uns oder einem Follow Objekte haengen, so
-// kann keine ProbeFormatierung stattfinden, da absatzgebundene
-// nicht richtig beruecksichtigt wuerden und zeichengebundene sollten
-// gar nicht zur Probe formatiert werden.
+{ // If there are objects hanging either on me or on a follow, we can't
+// do a test formatting, because paragraph bound objects wouldn't
+// be properly considered, and character bound objects shouldn't
+// be test formatted either.
if( pTmp-GetFrm()-GetDrawObjs() )
nRet = 1;
pTmp = pTmp-GetFollow();
@@ -352,13 +354,13 @@ sal_uInt8 SwFlowFrm::BwdMoveNecessary( const SwPageFrm
*pPage, const SwRect rRe
[Libreoffice-commits] .: 2 commits - sd/source
sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx| 21 +---
sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx | 14 -
sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 21 +++-
sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx |4 -
sd/source/ui/view/ToolBarManager.cxx | 46 ---
sd/source/ui/view/ViewShellManager.cxx | 44 +++---
6 files changed, 45 insertions(+), 105 deletions(-)
New commits:
commit 58d5e3032274b5a15ccc0bf2c9788cd18a5a63d4
Author: Rob Snelders programm...@ertai.nl
Date: Tue Apr 3 00:04:00 2012 +0200
SlsRequestQueue updated
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
index 966c5d2..a79ddaf 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx
@@ -31,10 +31,6 @@
#include set
-
-#undef VERBOSE
-//#define VERBOSE
-
namespace sd { namespace slidesorter { namespace cache {
/** This class extends the actual request data with additional information
@@ -118,7 +114,7 @@ void RequestQueue::AddRequest (
// If the request is already a member of the queue then remove it so
// that the following insertion will use the new prioritization.
-#ifdef VERBOSE
+#if OSL_DEBUG_LEVEL =2
bool bRemoved =
#endif
RemoveRequest(aKey);
@@ -130,13 +126,12 @@ void RequestQueue::AddRequest (
Request aRequest (aKey, nPriority, eRequestClass);
mpRequestQueue-insert(aRequest);
-SSCD_SET_REQUEST_CLASS(rRequestData.GetPage(),eRequestClass);
+SSCD_SET_REQUEST_CLASS(aKey,eRequestClass);
-#ifdef VERBOSE
-OSL_TRACE(%s request for page %d with priority class %d,
-bRemoved?replaced:added,
-(rRequestData.GetPage()-GetPageNum()-1)/2,
-eRequestClass);
+#if OSL_DEBUG_LEVEL =2
+SAL_INFO(sd.sls, OSL_THIS_FUNC : (bRemoved?replaced:added)
+ request for page ((aKey-GetPageNum()-1)/2)
+ with priority class static_castint(eRequestClass));
#endif
}
@@ -166,7 +161,7 @@ bool RequestQueue::RemoveRequest (
if (bRequestWasRemoved)
{
-SSCD_SET_STATUS(rRequest.GetPage(),NONE);
+SSCD_SET_STATUS(aKey,NONE);
}
}
else
@@ -195,7 +190,7 @@ void RequestQueue::ChangeClass (
if (iRequest!=mpRequestQueue-end() iRequest-meClass!=eNewRequestClass)
{
AddRequest(aKey, eNewRequestClass, true);
-SSCD_SET_REQUEST_CLASS(rRequestData.GetPage(),eNewRequestClass);
+SSCD_SET_REQUEST_CLASS(aKey,eNewRequestClass);
}
}
diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
index e59f7e3..9fe0dda 100644
--- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
+++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx
@@ -52,7 +52,7 @@ public:
/** Insert a request with highest or lowest priority in its priority
class. When the request is already present then it is first
removed. This effect is then a re-prioritization.
-@param rRequestData
+@param aKey
The request.
@param eRequestClass
The priority class in which to insert the request with highest
@@ -68,7 +68,7 @@ public:
bool bInsertWithHighestPriority = false);
/** Remove the specified request from the queue.
-@param rRequestData
+@param aKey
It is OK when the specified request is not a member of the
queue.
@return
commit 5ff6bf59c90cf3a55acffcb64e63f1da6dd5dec2
Author: Rob Snelders programm...@ertai.nl
Date: Mon Apr 2 22:54:08 2012 +0200
Removal of VERBOSE define
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index f369079..d556c5c 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -35,11 +35,6 @@
#include sdpage.hxx
#include drawdoc.hxx
-// Uncomment the following define for some more OSL_TRACE messages.
-#ifdef DEBUG
-//#define VERBOSE
-#endif
-
// Define the default value for the maximal cache size that is used for
// previews that are currently not visible. The visible previews are all
// held in memory at all times. This default is used only when the
@@ -421,9 +416,7 @@ void BitmapCache::ReCalculateTotalCacheSize (void)
}
mbIsFull = (mnNormalCacheSize = mnMaximalNormalCacheSize);
-#ifdef VERBOSE
-OSL_TRACE(cache size is %d/%d, mnNormalCacheSize, mnPreciousCacheSize);
-#endif
+SAL_INFO(sd.sls, OSL_THIS_FUNC : cache size is
mnNormalCacheSize / mnPreciousCacheSize);
}
@@ -527,9 +520,7 @@ void BitmapCache::UpdateCacheSize (const CacheEntry
rEntry, CacheOperation eOpe
if ( ! rEntry.IsPrecious()
[Libreoffice-commits] .: Branch 'update' - check.php
check.php | 20 +---
1 file changed, 17 insertions(+), 3 deletions(-)
New commits:
commit df91ff99377c9811ae434aa12f4532def56f26b3
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Apr 2 17:47:45 2012 +0200
Offer update to 3.5.2 RC2 (from 3.5.2 RC1).
diff --git a/check.php b/check.php
index a5157a3..3b5ad78 100644
--- a/check.php
+++ b/check.php
@@ -107,6 +107,12 @@ $update_versions = array(
'45a2874-aa8c38d-dff3b9c-def3dbd-62463c8' = 'LO-3.5', # 3.5.1 RC1
# To be uncommented when 3.5.2 Final is out
#'dc9775d-05ecbee-0851ad3-1586698-727bf66' = 'LO-3.5', # 3.5.1 RC2 /
Final
+
+# 3.5.2 versions
+# -pre to be deleted when 3.5.2 Final is out
+'1488b14-519dc6f-43021d0-52136ea-8d338cc' = 'LO-3.5-pre', # 3.5.2 RC1
+# To be uncommented when 3.5.3 Final is out
+#'281b639-6baa1d3-ef66a77-d866f25-f36d45f' = 'LO-3.5', # 3.5.2 RC2 /
Final
);
# Descriptions of the target versions
@@ -119,10 +125,18 @@ $update_map = array(
'version' = '3.5.1',
'update_type' = 'text/html',
'update_src' = 'http://www.libreoffice.org/download/'),
-# To be uncommented when 3.5.2 RC2 is out, to get updates from 3.5.2 RC1
+
+# To be removed when 3.5.2 RC2 becomes Final
+'LO-3.5-pre' = array('gitid' =
'281b639-6baa1d3-ef66a77-d866f25-f36d45f',
+ 'id' = 'LibreOffice 3.5.2 RC2',
+ 'version' = '3.5.2 RC2',
+ 'update_type' = 'text/html',
+ 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
+
+# To be uncommented when 3.5.3 RC2 is out, to get updates from 3.5.3 RC1
#'LO-3.5-pre' = array('gitid' = '',
-# 'id' = 'LibreOffice 3.5.2 RC2',
-# 'version' = '3.5.2 RC2',
+# 'id' = 'LibreOffice 3.5.3 RC2',
+# 'version' = '3.5.3 RC2',
# 'update_type' = 'text/html',
# 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/filter-showIncludes.pl | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
New commits:
commit 3cf66a899ec1c8eed3a95b7f08824d5c8db0d0a8
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Mar 30 13:44:33 2012 +0200
filter-showIncludes.pl: Attempt to prevent creating incomplete .d files.
diff --git a/solenv/gbuild/filter-showIncludes.pl
b/solenv/gbuild/filter-showIncludes.pl
index ee9a34b..d7082a2 100755
--- a/solenv/gbuild/filter-showIncludes.pl
+++ b/solenv/gbuild/filter-showIncludes.pl
@@ -13,6 +13,10 @@
#
# Original author: Jan Holesovsky ke...@suse.cz
+use File::Basename;
+use File::Copy;
+use File::Temp qw/tempfile/;
+
my $outfile = $ARGV[0];
my $objfile = $ARGV[1];
my $srcfile = $ARGV[2];
@@ -25,8 +29,9 @@ if ( !defined( $showincludes_prefix ) || $showincludes_prefix
eq ) {
$showincludes_prefix = 'Note: including file:';
}
-open( OUT, $outfile ) or die Cannot open $outfile for writing.;
-print OUT $objfile: \\\n $srcfile;
+my ($OUT, $tmp_filename) = tempfile( 'showIncludesXX', DIR = dirname(
$outfile ) ) or die Cannot create a temp file.;
+
+print $OUT $objfile: \\\n $srcfile;
my %seen;
my $first_line = 1;
@@ -45,7 +50,7 @@ while ( STDIN ) {
if ( !defined $seen{$_} ) {
$seen{$_} = 1;
-print OUT \\\n $_;
+print $OUT \\\n $_;
}
}
else {
@@ -56,7 +61,7 @@ while ( STDIN ) {
$first_line = 0;
}
-print OUT \n;
+print $OUT \n;
# fdo#40099 if header.h does not exist, it will simply be considered out of
# date and any targets that use it as a prerequisite will be updated,
@@ -64,9 +69,11 @@ print OUT \n;
# as an include
# see http://www.makelinux.net/make3/make3-CHP-8-SECT-3
foreach my $key ( keys %seen ) {
- print OUT \n$key:\n;
+ print $OUT \n$key:\n;
}
-close( OUT ) or die Cannot close $outfile.;
+close( $OUT ) or die Cannot close $tmp_filename.;
+
+move( $tmp_filename, $outfile ) or die Cannot move $tmp_filename to
$outfile.;
# vim: 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' - solenv/gbuild
solenv/gbuild/gbuild.mk |4 1 file changed, 4 insertions(+) New commits: commit af67f5f6438bde777c0cbb4d90c7f6bdcd831bf3 Author: Lubos Lunak l.lu...@suse.cz Date: Thu Mar 22 17:26:11 2012 -0500 make gbuild follow --disable-dependency-tracking too Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index e85ed83..574e851 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -116,12 +116,16 @@ ifneq ($(gb_DEBUGLEVEL),0) gb_SYMBOL := $(true) endif +ifneq ($(nodep),) +gb_FULLDEPS := $(false) +else # for clean, setuplocal and removelocal goals we switch off dependencies ifneq ($(filter cleanpackmodule clean setuplocal removelocal showdeliverables help debugrun,$(MAKECMDGOALS)),) gb_FULLDEPS := $(false) else gb_FULLDEPS := $(true) endif +endif # save user-supplied flags for latter use ifneq ($(strip $(CFLAGS)),) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basegfx/inc basegfx/source sw/source
basegfx/inc/basegfx/tools/zoomtools.hxx |2 --
basegfx/source/tools/zoomtools.cxx | 21 -
sw/source/ui/uiview/viewport.cxx|6 +++---
3 files changed, 3 insertions(+), 26 deletions(-)
New commits:
commit f626ff59b229ce7aec2f2313936133c53d70781f
Author: Tim Hardeck thard...@suse.com
Date: Thu Feb 23 19:59:34 2012 +0100
removed zoomtools int functions
Changed viewport.cxx to use long instead of int like all other zoom
functions and in this succession removed the zoomtools int functions
which where only added for this one exception.
diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx
b/basegfx/inc/basegfx/tools/zoomtools.hxx
index 566418d..44d9052 100644
--- a/basegfx/inc/basegfx/tools/zoomtools.hxx
+++ b/basegfx/inc/basegfx/tools/zoomtools.hxx
@@ -42,8 +42,6 @@ namespace basegfx
{
BASEGFX_DLLPUBLIC long zoomOut(long nCurrent);
BASEGFX_DLLPUBLIC long zoomIn(long nCurrent);
-BASEGFX_DLLPUBLIC int zoomOut(int nCurrent);
-BASEGFX_DLLPUBLIC int zoomIn(int nCurrent);
}
}
diff --git a/basegfx/source/tools/zoomtools.cxx
b/basegfx/source/tools/zoomtools.cxx
index d4b274c..34b0b8c 100644
--- a/basegfx/source/tools/zoomtools.cxx
+++ b/basegfx/source/tools/zoomtools.cxx
@@ -129,27 +129,6 @@ long zoomOut(long nCurrent)
nNew = enforceStep(nNew, nCurrent, 25);
return nNew;
}
-
-/**
-* Increasing the zoom level.
-*
-* @param nCurrent current zoom factor
-*/
-int zoomIn(int nCurrent)
-{
-return static_castint( zoomIn( long( nCurrent ) ) );
-}
-
-/**
-* Decreasing the zoom level.
-*
-* @param nCurrent current zoom factor
-*/
-int zoomOut(int nCurrent)
-{
-return static_castint( zoomOut( long( nCurrent ) ) );
-}
-
} // namespace zoomtools
} // namespace basegfx
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx
index d6b723d..e28d63e 100644
--- a/sw/source/ui/uiview/viewport.cxx
+++ b/sw/source/ui/uiview/viewport.cxx
@@ -1307,11 +1307,11 @@ sal_Bool SwView::HandleWheelCommands( const
CommandEvent rCEvt )
const CommandWheelData* pWData = rCEvt.GetWheelData();
if( pWData COMMAND_WHEEL_ZOOM == pWData-GetMode() )
{
-sal_uInt16 nFact = pWrtShell-GetViewOptions()-GetZoom();
+long nFact = pWrtShell-GetViewOptions()-GetZoom();
if( 0L pWData-GetDelta() )
-nFact = static_cast sal_uInt16 (Max( 20,
basegfx::zoomtools::zoomOut( static_castint(nFact) )));
+nFact = Max( (long) 20, basegfx::zoomtools::zoomOut( nFact ));
else
-nFact = static_cast sal_uInt16 (Min( 600,
basegfx::zoomtools::zoomIn( static_castint(nFact) )));
+nFact = Min( (long) 600, basegfx::zoomtools::zoomIn( nFact ));
SetZoom( SVX_ZOOM_PERCENT, nFact );
bOk = sal_True;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lcms2/makefile.mk
lcms2/makefile.mk |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) New commits: commit aa7901471055a6fdb34979e630044b3ffe551d73 Author: Jan Holesovsky ke...@suse.cz Date: Mon Mar 19 13:33:26 2012 +0100 Fix libcms2 build on MinGW. diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 2be34b5..99ad872 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -39,7 +39,11 @@ TARGET=so_lcms2 TARFILE_NAME=lcms2-2.3 TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 -PATCH_FILES = lcms2.patch lcms2-windows-export.patch +PATCH_FILES = lcms2.patch + +.IF $(CROSS_COMPILING)!=YES +PATCH_FILES += lcms2-windows-export.patch +.ENDIF .IF $(SYSTEM_LCMS2) == YES @all: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lcms2/makefile.mk
lcms2/makefile.mk |7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) New commits: commit f3e4e3ea9424fee25ddded30247a8e884ac4bd94 Author: Jan Holesovsky ke...@suse.cz Date: Mon Mar 19 13:42:15 2012 +0100 Better check when to use the lcms2-windows-export.patch. diff --git a/lcms2/makefile.mk b/lcms2/makefile.mk index 99ad872..ce5f2be 100644 --- a/lcms2/makefile.mk +++ b/lcms2/makefile.mk @@ -41,16 +41,15 @@ TARFILE_MD5=327348d67c979c88c2dec59a23a17d85 PATCH_FILES = lcms2.patch -.IF $(CROSS_COMPILING)!=YES -PATCH_FILES += lcms2-windows-export.patch -.ENDIF - .IF $(SYSTEM_LCMS2) == YES @all: @echo Using system littlecms2... .ENDIF .IF $(GUI)$(COM)==WNTMSC + +PATCH_FILES += lcms2-windows-export.patch + CONFIGURE_DIR=. CONFIGURE_ACTION = ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/source
desktop/source/app/langselect.cxx |6 ++
desktop/source/app/langselect.hxx |1 -
2 files changed, 2 insertions(+), 5 deletions(-)
New commits:
commit 43061897a69fbfc765170e87588f843fbd540e52
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Mar 19 14:34:35 2012 +0100
Workaround a strange wine / mingw crash.
diff --git a/desktop/source/app/langselect.cxx
b/desktop/source/app/langselect.cxx
index 7dbc4f2..387dca0 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -72,8 +72,6 @@ sal_Bool LanguageSelection::bFoundLanguage = sal_False;
OUString LanguageSelection::aFoundLanguage;
LanguageSelection::LanguageSelectionStatus LanguageSelection::m_eStatus =
LS_STATUS_OK;
-const OUString
LanguageSelection::usFallbackLanguage(RTL_CONSTASCII_USTRINGPARAM(en-US));
-
static sal_Bool existsURL( OUString const sURL )
{
using namespace osl;
@@ -335,11 +333,11 @@ OUString LanguageSelection::getLanguageString()
}
}
// fallback 1: en-US
-OUString usFB = usFallbackLanguage;
+OUString usFB(RTL_CONSTASCII_USTRINGPARAM(en-US));
if (isInstalledLanguage(usFB))
{
bFoundLanguage = sal_True;
-aFoundLanguage = usFallbackLanguage;
+aFoundLanguage = OUString(RTL_CONSTASCII_USTRINGPARAM(en-US));
return aFoundLanguage;
}
diff --git a/desktop/source/app/langselect.hxx
b/desktop/source/app/langselect.hxx
index 2fd8074..93b6bc4 100644
--- a/desktop/source/app/langselect.hxx
+++ b/desktop/source/app/langselect.hxx
@@ -54,7 +54,6 @@ public:
static LanguageSelectionStatus getStatus();
private:
-static const rtl::OUString usFallbackLanguage;
static rtl::OUString aFoundLanguage;
static sal_Bool bFoundLanguage;
static LanguageSelectionStatus m_eStatus;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: README.cross
README.cross |9 + 1 file changed, 9 insertions(+) New commits: commit e0c17f41a59ae395e4fca928350ec3eb6d9be723 Author: Jan Holesovsky ke...@suse.cz Date: Mon Mar 19 15:27:25 2012 +0100 How to examine strings in winedbg. diff --git a/README.cross b/README.cross index 818c335..3567a69 100644 --- a/README.cross +++ b/README.cross @@ -208,6 +208,15 @@ $ winedbg soffice.bin Would be great to be able to use winedbg --gdb, but it was crashing here :-( - but maybe you'll be more lucky. +Tricks of some use with winedbg: + + +To examine OUStrings, you might want to use the following trick (prints 50 +unicode characters of rLibName OUString - the +10 is where the buffer starts): + +Wine-dbgx /50u rLibName-pData+10 +0x0909b6c8: vnd.sun.star.expand:$LO_LIB_DIR/abplo.dll + TODO: - installation ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/bin
solenv/bin/linkoo |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6850bd15228eb496ba62fa08ef4f628336d63898
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Mar 19 15:35:23 2012 +0100
Improve linkoo for MinGW.
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 97ae2e3..daef867 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -113,7 +113,8 @@ my $brand_program_dir = 'program';
my $ure_lib_dir = 'ure-link/lib';
my $win_ure_lib_dir = 'URE/bin';
-my @exceptions = ( 'cppuhelper', 'libsunjavaplugin', 'libjvmfwk' );
+my @exceptions = ( 'libsunjavaplugin', 'libjvmfwk' );
+push @exceptions, 'cppuhelper' if ($TARGET ne 'wntgcci.pro');
my $bin;
$bin = |\\.bin if ($TARGET eq 'wntgcci.pro');
@@ -419,6 +420,8 @@ if (!-f $OOO_INSTALL/ . $brand_program_dir . /ooenv) {
evilness ('do');
-print \nlinkoo finished, please don't forget to source ooenv before
./soffice.\n;
+print \nlinkoo finished;
+print , please don't forget to source ooenv before ./soffice. if ($TARGET ne
'wntgcci.pro');
+print \n;
# 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 'update' - check.php
check.php | 19 ++-
1 file changed, 6 insertions(+), 13 deletions(-)
New commits:
commit bd668c3fff2668667d29e063cc1da50d39f981a0
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Mar 15 14:28:49 2012 +0100
3.5.1 RC2 is Final, update everything earlier to that.
diff --git a/check.php b/check.php
index 3622bf8..a5157a3 100644
--- a/check.php
+++ b/check.php
@@ -101,13 +101,12 @@ $update_versions = array(
'e40af8c-10029e3-615e522-88673a2-727f724' = 'LO-3.5', # 3.5.0 Beta3
'b6c8ba5-8c0b455-0b5e650-d7f0dd3-b100c87' = 'LO-3.5', # 3.5.0 RC1
'e371a95-bf68a13-5a1aa2b-d3c1ae9-b938258' = 'LO-3.5', # 3.5.0 RC2
-# To be uncommented when 3.5.1 Final is out
-#'7e68ba2-a744ebf-1f241b7-c506db1-7d53735' = 'LO-3.5', # 3.5.0 RC3 /
Final
+'7e68ba2-a744ebf-1f241b7-c506db1-7d53735' = 'LO-3.5', # 3.5.0 RC3 / Final
# 3.5.1 versions
-'45a2874-aa8c38d-dff3b9c-def3dbd-62463c8' = 'LO-3.5-pre', # 3.5.1 RC1
+'45a2874-aa8c38d-dff3b9c-def3dbd-62463c8' = 'LO-3.5', # 3.5.1 RC1
# To be uncommented when 3.5.2 Final is out
-#'dc9775d-05ecbee-0851ad3-1586698-727bf66' = 'LO-3.5', # 3.5.1 RC2
+#'dc9775d-05ecbee-0851ad3-1586698-727bf66' = 'LO-3.5', # 3.5.1 RC2 /
Final
);
# Descriptions of the target versions
@@ -115,17 +114,11 @@ $update_versions = array(
# 'gitid' is the content of program/versionrc:buildid of the newest version
# 'id' is what is going to be shown in the update information dialog
$update_map = array(
-'LO-3.5' = array('gitid' =
'7e68ba2-a744ebf-1f241b7-c506db1-7d53735',
- 'id' = 'LibreOffice 3.5.0',
- 'version' = '3.5.0',
+'LO-3.5' = array('gitid' =
'dc9775d-05ecbee-0851ad3-1586698-727bf66',
+ 'id' = 'LibreOffice 3.5.1',
+ 'version' = '3.5.1',
'update_type' = 'text/html',
'update_src' = 'http://www.libreoffice.org/download/'),
-# To be deleted when 3.5.1 is Final
-'LO-3.5-pre' = array('gitid' =
'dc9775d-05ecbee-0851ad3-1586698-727bf66',
- 'id' = 'LibreOffice 3.5.1 RC2',
- 'version' = '3.5.1 RC2',
- 'update_type' = 'text/html',
- 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
# To be uncommented when 3.5.2 RC2 is out, to get updates from 3.5.2 RC1
#'LO-3.5-pre' = array('gitid' = '',
# 'id' = 'LibreOffice 3.5.2 RC2',
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Writer.xcs |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit effe82efb67a3b444c3be5f978aef82b8e709165 Author: Cameron Paul cpau...@gmail.com Date: Fri Mar 9 08:33:48 2012 +0100 Disable auto-numbering by default. diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 700d213..e797988 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -4704,7 +4704,7 @@ descSpecifies if a numbered or bulleted text is created automatically while typing./desc labelApply numbering/label /info - valuetrue/value + valuefalse/value /prop group oor:name=SpecialCharacter info ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'update' - check.php
check.php | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
New commits:
commit 7ac0d162845332b0eb914282e56c165a2688c3db
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Mar 7 12:35:22 2012 +0100
Offer update to 3.5.1 RC2 (from 3.5.1 RC1).
diff --git a/check.php b/check.php
index f57b8fa..3622bf8 100644
--- a/check.php
+++ b/check.php
@@ -94,6 +94,7 @@ $localize_map = array(
# Every released version has to be added here (all betas, RC's and final
# versions) as soon as they are out
$update_versions = array(
+# 3.5.0 versions
'7362ca8-b5a8e65-af86909-d471f98-61464c4' = 'LO-3.5', # 3.5.0 Beta1
'8589e48-760cc4d-f39cf3d-1b2857e-60db978' = 'LO-3.5', # 3.5.0 Beta2
'da8462e-760cc4d-f39cf3d-1b2857e-60db978' = 'LO-3.5', # 3.5.0 Beta2
(MacOSX)
@@ -102,6 +103,11 @@ $update_versions = array(
'e371a95-bf68a13-5a1aa2b-d3c1ae9-b938258' = 'LO-3.5', # 3.5.0 RC2
# To be uncommented when 3.5.1 Final is out
#'7e68ba2-a744ebf-1f241b7-c506db1-7d53735' = 'LO-3.5', # 3.5.0 RC3 /
Final
+
+# 3.5.1 versions
+'45a2874-aa8c38d-dff3b9c-def3dbd-62463c8' = 'LO-3.5-pre', # 3.5.1 RC1
+# To be uncommented when 3.5.2 Final is out
+#'dc9775d-05ecbee-0851ad3-1586698-727bf66' = 'LO-3.5', # 3.5.1 RC2
);
# Descriptions of the target versions
@@ -114,10 +120,16 @@ $update_map = array(
'version' = '3.5.0',
'update_type' = 'text/html',
'update_src' = 'http://www.libreoffice.org/download/'),
-# To be uncommented when 3.5.1 RC2 is out, to get updates from 3.5.1 RC1
+# To be deleted when 3.5.1 is Final
+'LO-3.5-pre' = array('gitid' =
'dc9775d-05ecbee-0851ad3-1586698-727bf66',
+ 'id' = 'LibreOffice 3.5.1 RC2',
+ 'version' = '3.5.1 RC2',
+ 'update_type' = 'text/html',
+ 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
+# To be uncommented when 3.5.2 RC2 is out, to get updates from 3.5.2 RC1
#'LO-3.5-pre' = array('gitid' = '',
-# 'id' = 'LibreOffice 3.5.1 RC2',
-# 'version' = '3.5.1 RC2',
+# 'id' = 'LibreOffice 3.5.2 RC2',
+# 'version' = '3.5.2 RC2',
# 'update_type' = 'text/html',
# 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/core/layout/findfrm.cxx |1 +
sw/source/core/layout/flycnt.cxx |1 +
sw/source/core/layout/paintfrm.cxx |1 +
sw/source/core/layout/wsfrm.cxx|2 ++
4 files changed, 5 insertions(+)
New commits:
commit 0f1120ad344ae220a93bd2af9cf4a6bf50e25888
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Feb 27 15:09:52 2012 +0100
Fix build (few missing {'s in the translations).
diff --git a/sw/source/core/layout/findfrm.cxx
b/sw/source/core/layout/findfrm.cxx
index c4829a3..a2c7bf0 100644
--- a/sw/source/core/layout/findfrm.cxx
+++ b/sw/source/core/layout/findfrm.cxx
@@ -1365,6 +1365,7 @@ void SwFrm::SetInfFlags()
if( IsFtnContFrm() )
bInfFtn = sal_True;
do
+{
// bInfBody is only set in the page body, but not in the column body
if ( pFrm-IsBodyFrm() !bInfFtn pFrm-GetUpper()
pFrm-GetUpper()-IsPageFrm() )
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index 3c2cf9c..0e21be6 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -937,6 +937,7 @@ sal_uLong MA_FASTCALL lcl_FindCntDiff( const Point rPt,
const SwLayoutFrm *pLay
if ( pCnt-Frm().Top() = rPt.Y() )
{
if ( nDiff nDistance )
+{
//This one is the nearer one
nDistance = nNearest = nDiff;
rpCnt = pNearest = pCnt;
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index b9b903a..271ee0b 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -6189,6 +6189,7 @@ void MA_FASTCALL lcl_RefreshLine( const SwLayoutFrm *pLay,
aP2( rP2 );
while ( aP1.*pDirPt aP2.*pDirPt )
+{
//If the starting point lies in a fly, it is directly set behind the
//fly.
//The end point moves to the start if the end point lies in a fly or we
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index ff03015..e2600e3 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -741,6 +741,7 @@ void SwFrm::InsertGroupBefore( SwFrm* pParent, SwFrm*
pBehind, SwFrm* pSct )
pBehind-pPrev = pLast;
}
else
+{
//Insert at the end, or ... the first node in the subtree
pPrev = pUpper-Lower();
if ( pPrev )
@@ -931,6 +932,7 @@ void SwCntntFrm::Cut()
}
if( 0 != (pFrm = GetIndNext()) )
+{
//The old follower may calculated a gap to the predecessor which now
//becomes obsolete or different respectively as it becomes the first
//one itself.
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - wizards/com
wizards/com/sun/star/wizards/ui/ControlScroller.java |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 83ba2fb18f3ec7835591c6ffeda6e713bc09a9f9 Author: Julien Nabet serval2...@yahoo.fr Date: Thu Feb 23 20:00:40 2012 +0100 fdo#46339: Fix Query Wizard by putting the right ElementName Signed-off-by: Caolán McNamara caol...@redhat.com Signed-off-by: Jan Holesovsky ke...@suse.cz Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index a04d1c1..037a3ee 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -111,7 +111,7 @@ public abstract class ControlScroller iStartPosY = iCompPosY + SORELFIRSTPOSY; int ScrollHeight = iCompHeight - 2; nlineincrement = 1; -sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), imgBackground); +sIncSuffix = com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(), TitleScrollBar); xScrollBar = CurUnoDialog.insertScrollBar(TitleScrollBar + sIncSuffix, 0, new AdjustmentListenerImpl(), new String[] ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 5 commits - clucene/configs clucene/source distro-configs/LibreOfficeMinGW.conf fpicker/source sal/inc sal/systools
clucene/configs/_clucene-config-LINUX.h | 30 - clucene/configs/_clucene-config-MSVC.h | 224 +++ clucene/configs/_clucene-config-generic.h | 30 - clucene/configs/clucene-config-MINGW.h | 148 + clucene/configs/clucene-config-MSVC.h | 296 +- clucene/configs/clucene-config-generic.h| 40 - clucene/source/Makefile |6 distro-configs/LibreOfficeMinGW.conf|1 fpicker/source/win32/filepicker/FPentry.cxx |2 fpicker/source/win32/filepicker/VistaFilePicker.cxx |6 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx |6 fpicker/source/win32/filepicker/VistaFilePickerEventHandler.hxx |6 fpicker/source/win32/filepicker/VistaFilePickerImpl.cxx |6 fpicker/source/win32/filepicker/VistaFilePickerImpl.hxx |6 sal/inc/systools/win32/snprintf.h |3 sal/systools/win32/uwinapi/sntprintf.c |4 16 files changed, 487 insertions(+), 327 deletions(-) New commits: commit 3dee9ff1c938cbc2272772c1c6df6f11ef5bab0e Author: Jan Holesovsky ke...@suse.cz Date: Fri Feb 24 18:53:02 2012 +0100 MinGW: Make clucene build. diff --git a/clucene/configs/clucene-config-MINGW.h b/clucene/configs/clucene-config-MINGW.h new file mode 100644 index 000..be6f487 --- /dev/null +++ b/clucene/configs/clucene-config-MINGW.h @@ -0,0 +1,148 @@ +#ifndef _SRC_CLUCENE_CLUCENE_CONFIG_H +#define _SRC_CLUCENE_CLUCENE_CONFIG_H 1 + +/* src/shared/CLucene/clucene-config.h. +* Generated automatically at end of cmake. +*/ + +/* CMake will look for these headers: */ +#define _CL_HAVE_STRING_H 1 +#define _CL_HAVE_MEMORY_H 1 +/* #undef _CL_HAVE_UNISTD_H */ +#define _CL_HAVE_IO_H 1 +#define _CL_HAVE_DIRECT_H 1 +/* #undef _CL_HAVE_DIRENT_H */ +/* #undef _CL_HAVE_SYS_DIR_H */ +/* #undef _CL_HAVE_SYS_NDIR_H */ +#define _CL_HAVE_ERRNO_H 1 +#define _CL_HAVE_WCHAR_H 1 +#define _CL_HAVE_WCTYPE_H +#define _CL_HAVE_CTYPE_H 1 +#define _CL_HAVE_WINDOWS_H 1 +/* #undef _CL_HAVE_WINDEF_H */ +#define _CL_HAVE_SYS_TYPES_H 1 +/* #undef _CL_HAVE_DLFCN_H */ +/* #undef _CL_HAVE_EXT_HASH_MAP */ +/* #undef _CL_HAVE_EXT_HASH_SET */ +/* #undef _CL_HAVE_TR1_UNORDERED_MAP */ +/* #undef _CL_HAVE_TR1_UNORDERED_SET */ +/* #undef _CL_HAVE_HASH_MAP */ +/* #undef _CL_HAVE_HASH_SET */ +/* #undef _CL_HAVE_NDIR_H */ +#define _CL_HAVE_SYS_STAT_H 1 +#define _CL_HAVE_SYS_TIMEB_H 1 +/* #undef _CL_HAVE_SYS_TIME_H */ +#define _CL_HAVE_TCHAR_H 1 +/* #undef _CL_HAVE_SYS_MMAN_H */ +#define _CL_HAVE_WINERROR_H 1 +/* #undef _CL_HAVE_STDINT_H */ + +// our needed types +typedef signed char int8_t; +typedef unsigned char uint8_t; +typedef signed short int16_t; +typedef unsigned short uint16_t; +typedef signed int int32_t; +typedef unsigned int uint32_t; +typedef signed long long int64_t; +typedef unsigned long long uint64_t; + +/* undef float_t*/ +typedef unsigned long _cl_dword_t; +/* undef size_t size_t */ + +/* tchar _T definitions... */ +/* undef TCHAR TCHAR */ +/* #undef _T */ + +/* CMake will determine these specifics. Things like bugs, etc */ + +/* if we can't support the map/set hashing */ +/* #undef LUCENE_DISABLE_HASHING */ + +/* Define if you have POSIX threads libraries and header files. */ +/* #undef _CL_HAVE_PTHREAD */ + +/* Define if you have Win32 threads libraries and header files. */ +#define _CL_HAVE_WIN32_THREADS 1 + +/* Define if we have gcc atomic functions */ +/* #undef _CL_HAVE_GCC_ATOMIC_FUNCTIONS */ + +/* Define what eval method is required for float_t to be defined (for GCC). */ +/* #undef _FLT_EVAL_METHOD */ + +/* If we use hashmaps, which namespace do we use: */ +#define CL_NS_HASHING(func) +/* If we use hashmaps, which classes do we use: */ +#define _CL_HASH_MAP +#define _CL_HASH_SET + +/* define if the compiler implements namespaces */ +#define _CL_HAVE_NAMESPACES + +/* Defined if the snprintf overflow test fails */ +/* #undef _CL_HAVE_SNPRINTF_BUG */ + +/* Defined if the swprintf test fails */ +/* #undef _CL_HAVE_SNWPRINTF_BUG */ + +/* How to define a static const in a class */ +#define LUCENE_STATIC_CONSTANT(type, assignment) static const type assignment + +/* Define to the necessary symbol if this constant uses a non-standard name on + your system. */ +//todo: not checked +/* #undef _CL_PTHREAD_CREATE_JOINABLE */ + +/* Define to 1 if the `S_IS*' macros in sys/stat.h do not work properly. */ +//todo: not being checked for... +/* #undef _CL_STAT_MACROS_BROKEN */ + +/* Define to 1 if you can safely include both sys/time.h and time.h. */ +//not actually used for anything... +/* #undef _CL_TIME_WITH_SYS_TIME */ + +/* Define that we will be using -fvisibility=hidden, and + * make public classes visible using __attribute__ ((visibility(default
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - svx/Executable_gengal.bin.mk
svx/Executable_gengal.bin.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4fa7bc79cac0b9a6282a32d40b31177cd13807b3 Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Feb 19 19:49:57 2012 +0100 fix MinGW build Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk index 3143e5f..1f080fb 100644 --- a/svx/Executable_gengal.bin.mk +++ b/svx/Executable_gengal.bin.mk @@ -71,7 +71,7 @@ ifeq ($(OS),WNT) $(eval $(call gb_Executable_add_linked_libs,$(gengalbin),\ kernel32 \ msvcrt \ -oldnames \ +$(gb_Library_win32_OLDNAMES) \ user32 \ uwinapi \ )) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - np_sdk/mozsrc
np_sdk/mozsrc/npwin.cpp |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 19903d30def0a2bf63357031e56b18b5c4abea78
Author: Michael Meeks michael.me...@suse.com
Date: Sat Feb 18 08:07:55 2012 +
WaE: add horror cast to calm Windows tinderbox
Signed-off-by: Jan Holesovsky ke...@suse.cz
diff --git a/np_sdk/mozsrc/npwin.cpp b/np_sdk/mozsrc/npwin.cpp
index f31b621..204f5d1 100644
--- a/np_sdk/mozsrc/npwin.cpp
+++ b/np_sdk/mozsrc/npwin.cpp
@@ -168,7 +168,7 @@ NP_Shutdown()
char * NP_GetMIMEDescription()
{
-return NPP_GetMIMEDescription();
+ return (char *)NPP_GetMIMEDescription();
}
// END - PLUGIN DLL entry points
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - desktop/Executable_soffice.bin.mk desktop/Executable_unopkg.bin.mk
desktop/Executable_soffice.bin.mk |2 +- desktop/Executable_unopkg.bin.mk |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit a9c91748166a54520c82fd2d155e41081a400af4 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Jan 10 22:28:24 2012 -0600 OS_FOR_BUILD is not right do decide Host module name Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 7e168aa..99b894f 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) sofficebin := soffice_bin else sofficebin := soffice.bin diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 759a4e9..0b5d057 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) unopkgbin := unopkg_bin else unopkgbin := unopkg.bin ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sd/source
sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx |6
sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx|6
sd/source/ui/slidesorter/view/SlideSorterView.cxx | 14 +
sd/source/ui/slidesorter/view/SlsButtonBar.cxx| 129 +++---
4 files changed, 71 insertions(+), 84 deletions(-)
New commits:
commit 4866b20ec6205b04cd21077fd00d68c4d4bb2c1b
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Feb 17 23:32:52 2012 +0100
Slidesorter: Show the buttons on the opposite side...
...compared to where the mouse entered the slide thumbnail. This
seems to prevent a user annoyance when you very often used to hide
the slide, instead of just selecting it.
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index 4229665..d65bb90 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -226,13 +226,15 @@ public:
const bool bAnimate = true);
void SetPageUnderMouse (
const model::SharedPageDescriptor rpDescriptor,
-const bool bAnimate = true);
+const bool bAnimate = true,
+const Point rMousePosition = Point());
bool SetState (
const model::SharedPageDescriptor rpDescriptor,
const model::PageDescriptor::State eState,
const bool bStateValue,
-const bool bAnimate = true);
+const bool bAnimate = true,
+const Point rMousePosition = Point());
void UpdateOrientation (void);
diff --git a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
index 13b49f0..c6faee3 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsButtonBar.hxx
@@ -69,6 +69,11 @@ public:
const Point aMouseModelLocation,
const bool bIsMouseButtonDown);
+/// Decide whether the button should be drawn at the top, or the bottom.
+void UpdateButtonPosition(
+const model::SharedPageDescriptor rpDescriptor,
+const Point rMousePosition);
+
void ResetPage (void);
bool IsMouseOverBar (void) const;
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 4d63677..935f191 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -958,7 +958,7 @@ void SlideSorterView::UpdatePageUnderMouse (
const bool bAnimate)
{
// Update the page under the mouse.
-SetPageUnderMouse(rpDescriptor, bAnimate);
+SetPageUnderMouse(rpDescriptor, bAnimate, rMousePosition);
// Tell the button bar about the new mouse position.
SharedSdWindow pWindow (mrSlideSorter.GetContentWindow());
@@ -986,7 +986,8 @@ void SlideSorterView::UpdatePageUnderMouse (
void SlideSorterView::SetPageUnderMouse (
const model::SharedPageDescriptor rpDescriptor,
-const bool bAnimate)
+const bool bAnimate,
+const Point rMousePosition)
{
if (mpPageUnderMouse != rpDescriptor)
{
@@ -996,7 +997,7 @@ void SlideSorterView::SetPageUnderMouse (
mpPageUnderMouse = rpDescriptor;
if (mpPageUnderMouse)
-SetState(mpPageUnderMouse, PageDescriptor::ST_MouseOver, true,
bAnimate);
+SetState(mpPageUnderMouse, PageDescriptor::ST_MouseOver, true,
bAnimate, rMousePosition);
// Change the quick help text to display the name of the page under
// the mouse.
@@ -1011,7 +1012,8 @@ bool SlideSorterView::SetState (
const model::SharedPageDescriptor rpDescriptor,
const PageDescriptor::State eState,
const bool bStateValue,
-const bool bAnimate)
+const bool bAnimate,
+const Point rMousePosition)
{
model::SharedPageDescriptor pDescriptor (rpDescriptor);
if ( ! pDescriptor)
@@ -1039,7 +1041,11 @@ bool SlideSorterView::SetState (
if (eState == PageDescriptor::ST_MouseOver)
{
if (bStateValue)
+{
+if (bAnimate)
+GetButtonBar().UpdateButtonPosition(rpDescriptor,
rMousePosition);
GetButtonBar().RequestFadeIn(rpDescriptor, bAnimate);
+}
else
GetButtonBar().RequestFadeOut(rpDescriptor, bAnimate);
}
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index 06a2074..fc4d05b 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -68,19 +68,25 @@ namespace sd { namespace slidesorter { namespace view {
class ButtonBar::BackgroundTheme
{
public:
+enum ButtonPosition { TOP, BOTTOM };
+public:
BackgroundTheme(
const ::boost::shared_ptrTheme rpTheme,
const ::std::vectorSharedButton rButtons);
-virtual ~BackgroundTheme
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - scp2/source
scp2/source/ooo/file_ooo.scp | 14 -- 1 file changed, 4 insertions(+), 10 deletions(-) New commits: commit 78a5d35ec1907e4b5add1014801dbac992cee48e Author: Michael Stahl mst...@redhat.com Date: Wed Feb 15 13:13:29 2012 +0100 fdo#45530: scp2: java accessibilty bridge cleanup: AFAIK java_uno_accessbridge.jar is only required on WNT. Also remove the duplicate old definition of gid_File_Jar_Accessbridge that was effectively disabled by 6fdde9acfd5aebd23400e7101c8ddff80fcdd8fa. Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index dd6cd74..7f1cc64 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -376,16 +376,6 @@ File gid_File_Help_Schart_Zip End #endif -#if defined SOLAR_JAVA defined INCLUDE_JAVA_ACCESSBRIDGE defined WNT - -File gid_File_Jar_Accessbridge -TXT_FILE_BODY; -Name = java_uno_accessbridge.jar; -Dir = gid_Dir_Classes; -Styles = (PACKED,DONT_OVERWRITE); -End - -#endif #ifdef SOLAR_JAVA #ifndef SYSTEM_LUCENE @@ -423,6 +413,9 @@ STD_JAR_FILE( gid_File_Jar_Fax, fax ) STD_JAR_FILE( gid_File_Jar_Agenda, agenda ) STD_JAR_FILE( gid_File_Jar_Query, query ) STD_JAR_FILE( gid_File_Jar_Web, web ) +#endif + +#if defined SOLAR_JAVA defined WNT STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge ) #endif commit 24dfc1a6238902a122f5cf835c83b2f54b8819fb Author: Masataka Shinke mshi...@users.sourceforge.jp Date: Wed Feb 15 13:10:44 2012 +0100 fdo#45530: Accessibility does not work on WNT Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index e7bc85a..dd6cd74 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -423,6 +423,7 @@ STD_JAR_FILE( gid_File_Jar_Fax, fax ) STD_JAR_FILE( gid_File_Jar_Agenda, agenda ) STD_JAR_FILE( gid_File_Jar_Query, query ) STD_JAR_FILE( gid_File_Jar_Web, web ) +STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge ) #endif #ifdef SOLAR_JAVA ___ 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
Repository.mk |1 + 1 file changed, 1 insertion(+) New commits: commit d532c1d111f76a581af6d3d1ccbeca7940bdb840 Author: Jan Holesovsky ke...@suse.cz Date: Wed Feb 15 17:55:45 2012 +0100 Fix Windows build. Signed-off-by: Petr Mladek pmla...@suse.cz diff --git a/Repository.mk b/Repository.mk index 863024f..251405b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ + crashrep_com \ guiloader \ guistdio \ odbcconfig \ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'update' - check.php
check.php | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 9fbd7ac6eb460e47f6caf4f561295296c045cb10
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Feb 14 12:33:11 2012 +0100
3.5.0 RC3 is Final.
diff --git a/check.php b/check.php
index 2edad15..f57b8fa 100644
--- a/check.php
+++ b/check.php
@@ -100,7 +100,8 @@ $update_versions = array(
'e40af8c-10029e3-615e522-88673a2-727f724' = 'LO-3.5', # 3.5.0 Beta3
'b6c8ba5-8c0b455-0b5e650-d7f0dd3-b100c87' = 'LO-3.5', # 3.5.0 RC1
'e371a95-bf68a13-5a1aa2b-d3c1ae9-b938258' = 'LO-3.5', # 3.5.0 RC2
-#'7e68ba2-a744ebf-1f241b7-c506db1-7d53735' = 'LO-3.5', # 3.5.0 RC3
+# To be uncommented when 3.5.1 Final is out
+#'7e68ba2-a744ebf-1f241b7-c506db1-7d53735' = 'LO-3.5', # 3.5.0 RC3 /
Final
);
# Descriptions of the target versions
@@ -109,10 +110,16 @@ $update_versions = array(
# 'id' is what is going to be shown in the update information dialog
$update_map = array(
'LO-3.5' = array('gitid' =
'7e68ba2-a744ebf-1f241b7-c506db1-7d53735',
- 'id' = 'LibreOffice 3.5.0 RC3',
- 'version' = '3.5.0 RC3',
+ 'id' = 'LibreOffice 3.5.0',
+ 'version' = '3.5.0',
'update_type' = 'text/html',
- 'update_src' =
'http://www.libreoffice.org/download/pre-releases/')
+ 'update_src' = 'http://www.libreoffice.org/download/'),
+# To be uncommented when 3.5.1 RC2 is out, to get updates from 3.5.1 RC1
+#'LO-3.5-pre' = array('gitid' = '',
+# 'id' = 'LibreOffice 3.5.1 RC2',
+# 'version' = '3.5.1 RC2',
+# 'update_type' = 'text/html',
+# 'update_src' =
'http://www.libreoffice.org/download/pre-releases/'),
);
# Print the update xml
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/core/layout/paintfrm.cxx |3 +
sw/source/ui/docvw/HeaderFooterWin.cxx | 97 +++--
sw/source/ui/docvw/PageBreakWin.cxx| 46 +++
sw/source/ui/inc/HeaderFooterWin.hxx |1
4 files changed, 70 insertions(+), 77 deletions(-)
New commits:
commit de03d27c597b1f56d5d68d1a8181e2889dc5b1cb
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Feb 13 11:20:22 2012 +0100
Header/Footer, Page Break: don't show them in RO mode (fdo#45548)
Signed-off-by: Jan Holesovsky ke...@suse.cz
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index dced1b7..f7be549 100755
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3341,6 +3341,7 @@ void SwPageFrm::PaintBreak( ) const
{
if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER
!pGlobalShell-GetViewOptions()-IsPDFExport()
+ !pGlobalShell-GetViewOptions()-IsReadonly()
!pGlobalShell-IsPreView() )
{
const SwFrm* pBodyFrm = Lower();
@@ -3377,6 +3378,7 @@ void SwColumnFrm::PaintBreak( ) const
{
if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER
!pGlobalShell-GetViewOptions()-IsPDFExport()
+ !pGlobalShell-GetViewOptions()-IsReadonly()
!pGlobalShell-IsPreView() )
{
const SwFrm* pBodyFrm = Lower();
@@ -3486,6 +3488,7 @@ void SwPageFrm::PaintDecorators( ) const
if ( pGlobalShell-GetOut()-GetOutDevType() != OUTDEV_PRINTER
!pGlobalShell-GetViewOptions()-IsPDFExport()
!pGlobalShell-IsPreView()
+ !pGlobalShell-GetViewOptions()-IsReadonly()
( pGlobalShell-IsShowHeaderFooterSeparator( Header ) ||
pGlobalShell-IsShowHeaderFooterSeparator( Footer ) ) )
{
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx
b/sw/source/ui/docvw/HeaderFooterWin.cxx
index 330c1ff..32e8767 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -148,7 +148,6 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin,
const SwPageFrm* pPag
SwFrameControl( pEditWin, pPageFrm ),
m_sLabel( ),
m_bIsHeader( bHeader ),
-m_bReadonly( false ),
m_pPopupMenu( NULL ),
m_pLine( NULL ),
m_bIsAppearing( false ),
@@ -329,57 +328,54 @@ void SwHeaderFooterWin::Paint( const Rectangle )
com::sun::star::lang::Locale(),
aLineColor ) );
-// Create the 'plus' or 'arrow' primitive if not readonly
-if ( !m_bReadonly )
-{
-B2DRectangle aSignArea( B2DPoint( aRect.Right() - BUTTON_WIDTH, 0.0 ),
-B2DSize( aRect.Right(), aRect.getHeight() ) );
+// Create the 'plus' or 'arrow' primitive
+B2DRectangle aSignArea( B2DPoint( aRect.Right() - BUTTON_WIDTH, 0.0 ),
+B2DSize( aRect.Right(), aRect.getHeight() ) );
-B2DPolygon aSign;
-if ( IsEmptyHeaderFooter( ) )
-{
-// Create the + polygon
-double nLeft = aSignArea.getMinX() + TEXT_PADDING;
-double nRight = aSignArea.getMaxX() - TEXT_PADDING;
-double nHalfW = ( nRight - nLeft ) / 2.0;
-
-double nTop = aSignArea.getCenterY() - nHalfW;
-double nBottom = aSignArea.getCenterY() + nHalfW;
-
-aSign.append( B2DPoint( nLeft, aSignArea.getCenterY() - 1.0 ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() - 1.0,
aSignArea.getCenterY() - 1.0 ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() - 1.0, nTop ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() + 1.0, nTop ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() + 1.0,
aSignArea.getCenterY() - 1.0 ) );
-aSign.append( B2DPoint( nRight, aSignArea.getCenterY() - 1.0 ) );
-aSign.append( B2DPoint( nRight, aSignArea.getCenterY() + 1.0 ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() + 1.0,
aSignArea.getCenterY() + 1.0 ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() + 1.0, nBottom ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() - 1.0, nBottom ) );
-aSign.append( B2DPoint( aSignArea.getCenterX() - 1.0,
aSignArea.getCenterY() + 1.0 ) );
-aSign.append( B2DPoint( nLeft, aSignArea.getCenterY() + 1.0 ) );
-aSign.setClosed( true );
-}
-else
-{
-// Create the v polygon
-B2DPoint aLeft( aSignArea.getMinX() + TEXT_PADDING,
aSignArea.getCenterY() );
-B2DPoint aRight( aSignArea.getMaxX() - TEXT_PADDING,
aSignArea.getCenterY() );
-B2DPoint aBottom( ( aLeft.getX() + aRight.getX() ) / 2.0,
aLeft.getY() + 4.0 );
-aSign.append( aLeft );
-aSign.append( aRight );
-aSign.append( aBottom
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/ui/uiview/viewport.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit 77249060109a68783358af87a2bcdfc4c710d760 Author: Ivan Timofeev timofeev@gmail.com Date: Thu Feb 9 21:06:06 2012 +0400 always use the *real* visibility of the SwScrollbar [this is a follow-up of fdo#30788] Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index e4fc725..2ba6b0a 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -838,9 +838,7 @@ void SwView::CalcAndSetBorderPixel( SvBorder rToFill, sal_Bool /*bInner*/ ) else rToFill.Right() = nTmp; } -//#i32913# in browse mode the visibility of the horizontal scrollbar -// depends on the content (fixed width tables may require a scrollbar) -if ( pHScrollbar-IsVisible(pWrtShell-GetViewOptions()-getBrowseMode()) ) +if ( pHScrollbar-IsVisible(sal_True) ) rToFill.Bottom() = nTmp; SetBorderPixel( rToFill ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/propctrlr/browserlistbox.cxx | 138 -
extensions/source/propctrlr/browserlistbox.hxx | 23 +---
2 files changed, 73 insertions(+), 88 deletions(-)
New commits:
commit 8912cf30755a2a19d50acc3bb0f5352506638fad
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Feb 10 14:12:17 2012 +0100
fdo#40261: Fix crash in XML Form Document.
The data structure holding the UI elements in the browser listbox was a
terrible mess - it held the items in an unordered_map, but then accessed
them via a vector containing iterators to this unordered_map.
Fixed the problem (and cleaned all this up) by removing the vector of
iterators, and turning the unordered_map into a normal vector. When we need
access by name, we just go through all the items; it is always just a
handful
of them anyway.
diff --git a/extensions/source/propctrlr/browserlistbox.cxx
b/extensions/source/propctrlr/browserlistbox.cxx
index 3299002..0abddac 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -470,7 +470,7 @@ namespace pcr
UpdateVScroll();
-sal_Bool bNeedScrollbar = m_aOrderedLines.size()
(sal_uInt32)CalcVisibleLines();
+sal_Bool bNeedScrollbar = m_aLines.size()
(sal_uInt32)CalcVisibleLines();
if ( !bNeedScrollbar )
{
if ( m_aVScroll.IsVisible() )
@@ -493,7 +493,7 @@ namespace pcr
m_aVScroll.SetPosSizePixel( aVScrollPos, aVScrollSize );
}
-for ( sal_uInt16 i = 0; i m_aOrderedLines.size(); ++i )
+for ( sal_uInt16 i = 0; i m_aLines.size(); ++i )
m_aOutOfDateLines.insert( i );
// repaint
@@ -595,15 +595,16 @@ namespace pcr
aPos.Y() += _nIndex * m_nRowHeight;
-if ( _nIndex m_aOrderedLines.size() )
+if ( _nIndex m_aLines.size() )
{
-m_aOrderedLines[ _nIndex ]-second.pLine-SetPosSizePixel( aPos,
aSize );
+BrowserLinePointer pLine = m_aLines[ _nIndex ].pLine;
-m_aOrderedLines[ _nIndex ]-second.pLine-SetTitleWidth(
m_nTheNameSize + 2 * FRAME_OFFSET );
+pLine-SetPosSizePixel( aPos, aSize );
+pLine-SetTitleWidth( m_nTheNameSize + 2 * FRAME_OFFSET );
// show the line if necessary
-if ( !m_aOrderedLines[ _nIndex ]-second.pLine-IsVisible() )
-m_aOrderedLines[ _nIndex ]-second.pLine-Show();
+if ( !pLine-IsVisible() )
+pLine-Show();
}
}
@@ -615,8 +616,8 @@ namespace pcr
++aLoop
)
{
-DBG_ASSERT( *aLoop m_aOrderedLines.size(),
OBrowserListBox::UpdatePosNSize: invalid line index! );
-if ( *aLoop m_aOrderedLines.size() )
+DBG_ASSERT( *aLoop m_aLines.size(),
OBrowserListBox::UpdatePosNSize: invalid line index! );
+if ( *aLoop m_aLines.size() )
PositionLine( *aLoop );
}
m_aOutOfDateLines.clear();
@@ -629,10 +630,10 @@ namespace pcr
sal_Int32 nLines = CalcVisibleLines();
sal_uInt16 nEnd = (sal_uInt16)(nThumbPos + nLines);
-if (nEnd = m_aOrderedLines.size())
-nEnd = (sal_uInt16)m_aOrderedLines.size()-1;
+if (nEnd = m_aLines.size())
+nEnd = (sal_uInt16)m_aLines.size()-1;
-if ( !m_aOrderedLines.empty() )
+if ( !m_aLines.empty() )
{
for ( sal_uInt16 i = (sal_uInt16)nThumbPos; i = nEnd; ++i )
m_aOutOfDateLines.insert( i );
@@ -662,18 +663,21 @@ namespace pcr
//--
void OBrowserListBox::SetPropertyValue(const ::rtl::OUString _rEntryName,
const Any _rValue, bool _bUnknownValue )
{
-ListBoxLines::iterator line = m_aLines.find( _rEntryName );
+ListBoxLines::iterator line = m_aLines.begin();
+for ( ; line != m_aLines.end() ( line-aName != _rEntryName );
++line )
+;
+
if ( line != m_aLines.end() )
{
if ( _bUnknownValue )
{
-Reference XPropertyControl xControl(
line-second.pLine-getControl() );
+Reference XPropertyControl xControl(
line-pLine-getControl() );
OSL_ENSURE( xControl.is(), OBrowserListBox::SetPropertyValue:
illegal control! );
if ( xControl.is() )
xControl-setValue( Any() );
}
else
-impl_setControlAsPropertyValue( line-second, _rValue );
+impl_setControlAsPropertyValue( *line, _rValue );
}
}
@@ -681,14 +685,14 @@ namespace pcr
sal_uInt16 OBrowserListBox::GetPropertyPos( const ::rtl::OUString
_rEntryName ) const
{
sal_uInt16 nRet = LISTBOX_ENTRY_NOTFOUND;
-for ( OrderedListBoxLines::const_iterator linePos
[Libreoffice-commits] .: xmloff/source
xmloff/source/text/txtparai.cxx | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 9951de4a10386a85dc1bfa465304cd0005414b8e
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Feb 10 17:54:03 2012 +0100
fdo#42771: Fix crash when loading an invalid .fodt.
createTextCursorByRange() likes to throw runtime exception, even though it
just means 'we were unable to create the cursor'.
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 721e03b..70848c4 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -2031,10 +2031,16 @@ XMLParaContext::~XMLParaContext()
xTxtImport-InsertControlCharacter( ControlCharacter::APPEND_PARAGRAPH );
// create a cursor that select the whole last paragraph
-Reference XTextCursor xAttrCursor(
-xTxtImport-GetText()-createTextCursorByRange( xStart ));
-if( !xAttrCursor.is() )
-return; // Robust (defect file)
+Reference XTextCursor xAttrCursor;
+try {
+xAttrCursor = xTxtImport-GetText()-createTextCursorByRange( xStart );
+if( !xAttrCursor.is() )
+return; // Robust (defect file)
+} catch (uno::Exception ) {
+// createTextCursorByRange() likes to throw runtime exception, even
+// though it just means 'we were unable to create the cursor'
+return;
+}
xAttrCursor-gotoRange( xEnd, sal_True );
// xml:id for RDF metadata
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basegfx/source
basegfx/source/tools/zoomtools.cxx |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 4db617efd924ad7ff4ce6988771ad36612c329ec
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Feb 6 16:12:40 2012 +0100
Change the zoom factor to 2^(1/6), hopefully it fits all :-)
diff --git a/basegfx/source/tools/zoomtools.cxx
b/basegfx/source/tools/zoomtools.cxx
index c6c8044..89ea0cc 100644
--- a/basegfx/source/tools/zoomtools.cxx
+++ b/basegfx/source/tools/zoomtools.cxx
@@ -33,12 +33,12 @@ namespace basegfx
namespace zoomtools
{
-/** 2^(1/4) as the default step
+/** 2^(1/6) as the default step
-This ensures (unless the rounding is used) that 4 steps lead
+This ensures (unless the rounding is used) that 6 steps lead
to double / half zoom level.
*/
-const double ZOOM_FACTOR = 1.1892071150027210667175;
+const double ZOOM_FACTOR = 1.12246205;
/**
* Round a value against a specified multiple. Values below half
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - postgresql/libpq-parallel-build.patch postgresql/makefile.mk
postgresql/libpq-parallel-build.patch | 11 +++ postgresql/makefile.mk|1 + 2 files changed, 12 insertions(+) New commits: commit 5b381e2adb00a384d34354e45052c73773843dfd Author: Lionel Elie Mamane lio...@mamane.lu Date: Mon Feb 6 15:17:20 2012 +0100 fix postgresql massive-parallel build Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/postgresql/libpq-parallel-build.patch b/postgresql/libpq-parallel-build.patch new file mode 100644 index 000..237a483 --- /dev/null +++ b/postgresql/libpq-parallel-build.patch @@ -0,0 +1,11 @@ +diff --recursive -u misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile misc/build/postgresql-9.1.1.patch/src/interfaces/libpq/Makefile +--- misc/build/postgresql-9.1.1/src/interfaces/libpq/Makefile 2012-02-06 15:11:19.0 +0100 misc/build/postgresql-9.1.1.patch/src/interfaces/libpq/Makefile 2012-02-06 15:02:51.0 +0100 +@@ -109,6 +109,7 @@ + libpq.rc: $(top_builddir)/src/Makefile.global + + fe-connect.o: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h ++fe-misc.o: fe-misc.c $(top_builddir)/src/port/pg_config_paths.h + + $(top_builddir)/src/port/pg_config_paths.h: + $(MAKE) -C $(top_builddir)/src/port pg_config_paths.h diff --git a/postgresql/makefile.mk b/postgresql/makefile.mk index 8b57a07..dda5242 100644 --- a/postgresql/makefile.mk +++ b/postgresql/makefile.mk @@ -39,6 +39,7 @@ TARGET=so_postgresql TARFILE_NAME=postgresql-9.1.1 TARFILE_MD5=061a9f17323117c9358ed60f33ecff78 PATCH_FILES=\ + libpq-parallel-build.patch \ $(TARFILE_NAME).patch .IF $(SYSTEM_POSTGRESQL) == YES ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - dbaccess/source
dbaccess/source/core/api/KeySet.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit acc36a60de35cdc07e41d1838738b7603e87cf4d
Author: Lionel Elie Mamane lio...@mamane.lu
Date: Tue Jan 31 21:32:55 2012 +0100
fdo#45453: use integers rather than booleans
for always-true and always-false tests.
Some databases have poor or no support for booleans.
Signed-off-by: Jan Holesovsky ke...@suse.cz
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index b41e68b..8e42b30 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -228,8 +228,8 @@ namespace
void appendOneKeyColumnClause( const ::rtl::OUString tblName, const
::rtl::OUString colName, ::rtl::OUStringBuffer o_buf )
{
static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(.));
-static ::rtl::OUString s_sParam0(RTL_CONSTASCII_USTRINGPARAM( ( TRUE
= ? AND ));
-static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM( = ? OR
TRUE = ? AND ));
+static ::rtl::OUString s_sParam0(RTL_CONSTASCII_USTRINGPARAM( ( 1 = ?
AND ));
+static ::rtl::OUString s_sParam1(RTL_CONSTASCII_USTRINGPARAM( = ? OR
1 = ? AND ));
static ::rtl::OUString s_sParam2(RTL_CONSTASCII_USTRINGPARAM( IS NULL
) ));
o_buf.append(s_sParam0);
o_buf.append(tblName);
@@ -247,16 +247,16 @@ void OKeySet::setOneKeyColumnParameter( sal_Int32 nPos,
const Reference XParam
{
if ( _rValue.isNull() )
{
-_xParameter-setBoolean( nPos++, false );
+_xParameter-setByte( nPos++, 0 );
// We do the full call so that the right sqlType is passed to setNull
setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
-_xParameter-setBoolean( nPos++, true );
+_xParameter-setByte( nPos++, 1 );
}
else
{
-_xParameter-setBoolean( nPos++, true );
+_xParameter-setByte( nPos++, 1 );
setParameter( nPos++, _xParameter, _rValue, _nType, _nScale );
-_xParameter-setBoolean( nPos++, false );
+_xParameter-setByte( nPos++, 0 );
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/ui/ControlScroller.java | 23 ---
1 file changed, 23 deletions(-)
New commits:
commit 03e17a141fbb4e1242de9d9979b5b699e6840454
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jan 31 17:10:26 2012 +0100
Fix fdo#42543: Don't paint a frame around the list of edit boxes.
This conflicts with commit efc6b840a0423099d6c3e0d33c14d34637fbba4c that
reorders painting of windows when they overlap; and in this case, the frame
image paints over the controls.
The sideeffect is that the dialog looks nicer ;-)
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java
b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index c9aeee6..a04d1c1 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -39,7 +39,6 @@ public abstract class ControlScroller
protected WizardDialog CurUnoDialog;
protected XMultiServiceFactory xMSF;
-private Object oImgControl;
protected int ncurfieldcount;
protected int nblockincrement;
private int nlineincrement;
@@ -113,17 +112,6 @@ public abstract class ControlScroller
int ScrollHeight = iCompHeight - 2;
nlineincrement = 1;
sIncSuffix =
com.sun.star.wizards.common.Desktop.getIncrementSuffix(CurUnoDialog.getDlgNameAccess(),
imgBackground);
-oImgControl =
CurUnoDialog.insertControlModel(com.sun.star.awt.UnoControlImageControlModel,
imgBackground + sIncSuffix,
-new String[]
-{
-PropertyNames.PROPERTY_BORDER,
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_POSITION_X,
PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_WIDTH
-},
-new Object[]
-{
-new Short(1), new Integer(iCompHeight), ICompPosX, new
Integer(iCompPosY), IStep, ICompWidth
-});
-oImgControl = CurUnoDialog.xDlgContainer.getControl(imgBackground +
sIncSuffix);
-setComponentMouseTransparent();
xScrollBar = CurUnoDialog.insertScrollBar(TitleScrollBar +
sIncSuffix, 0,
new AdjustmentListenerImpl(),
new String[]
@@ -143,17 +131,6 @@ public abstract class ControlScroller
}
}
-public void setComponentMouseTransparent()
-{
-CurUnoDialog.getPeerConfiguration().setPeerProperties(oImgControl, new
String[]
-{
-MouseTransparent
-}, new Boolean[]
-{
-Boolean.TRUE
-});
-}
-
protected void setScrollBarOrientationHorizontal()
{
Helper.setUnoPropertyValue(xScrollBar, PropertyNames.ORIENTATION, new
Integer(ScrollBarOrientation.HORIZONTAL));
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - basegfx/inc basegfx/Library_basegfx.mk basegfx/Package_inc.mk basegfx/source basegfx/StaticLibrary_basegfx_s.mk Makefile sc/source sd/source solenv/bin svx/inc svx
Makefile|5 + basegfx/Library_basegfx.mk |1 basegfx/Package_inc.mk |1 basegfx/StaticLibrary_basegfx_s.mk |1 basegfx/inc/basegfx/tools/zoomtools.hxx | 52 +++ basegfx/source/tools/zoomtools.cxx | 150 sc/source/ui/view/prevwsh.cxx |6 - sc/source/ui/view/tabview.cxx |7 - sd/source/ui/view/viewshel.cxx |7 - solenv/bin/mkdocs.sh|2 svx/inc/svx/zoom_def.hxx|4 svx/source/stbctrls/zoomsliderctrl.cxx |7 - sw/source/ui/uiview/viewport.cxx|7 - 13 files changed, 226 insertions(+), 24 deletions(-) New commits: commit 3092e57f0c46ab1eafebcff0ad875acdd49d4e45 Author: Jan Holesovsky ke...@suse.cz Date: Wed Jan 25 12:35:29 2012 +0100 Add a note to the toplevel Makefile where to actually edit stuff. diff --git a/Makefile b/Makefile index 9f6c897..ed8e30e 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,11 @@ # #* +# The real targets are in solenv/gbuild/Module.mk, resp. +# solenv/gbuild/extensions/post_BuildplTargets.mk, this file only forwards +# the calls - please look there if you want to edit what this toplevel +# Makefile does. + SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST) ifeq ($(strip $(gb_SourceEnvAndRecurse_STAGE)),) commit 1195d989d454a96e3b9fb0c0b6053db61b68f0b1 Author: Jan Holesovsky ke...@suse.cz Date: Wed Jan 25 12:34:56 2012 +0100 Allow killing 'make docs' by Ctrl-c. diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index 1112b0f..dbf4c46 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -89,7 +89,7 @@ do echo Ref-Tags: $DOXYGEN_REF_TAGFILES echo Title: $DOXYGEN_PROJECTNAME - nice -15 doxygen $DOXYGEN_CFG + nice -15 doxygen $DOXYGEN_CFG || exit 1 # setup referenced tagfiles for next round DOXYGEN_REF_TAGFILES=$DOXYGEN_REF_TAGFILES $DOXYGEN_OUR_TAGFILE=$BASE_URL/$PROJECT/html commit 315d2ddc161e4b296febe9e54c3cfc9270310bfe Author: Tim Hardeck thard...@suse.com Date: Wed Jan 18 16:42:55 2012 +0100 optimized zoom to use more common intervals Round zoom values beginning with 50 to a multiple of 5, with 100 to one of 10, with 500 to one of 50 and with 1000 to one of 100. The step 100 is enforced to have one fixed point. diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index fa0607b..fc6a479 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -66,6 +66,7 @@ $(eval $(call gb_Library_add_linked_libs,basegfx,\ $(eval $(call gb_Library_add_exception_objects,basegfx,\ basegfx/source/tools/b2dclipstate \ basegfx/source/tools/canvastools \ + basegfx/source/tools/zoomtools \ basegfx/source/tools/gradienttools \ basegfx/source/tools/keystoplerp \ basegfx/source/tools/liangbarsky \ diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk index 5767a8f..13b5ff8 100644 --- a/basegfx/Package_inc.mk +++ b/basegfx/Package_inc.mk @@ -37,6 +37,7 @@ $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unopolypolygon.h $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/tools.hxx,basegfx/tools/tools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/unotools.hxx,basegfx/tools/unotools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/gradienttools.hxx,basegfx/tools/gradienttools.hxx)) +$(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tools/zoomtools.hxx,basegfx/tools/zoomtools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/numeric/ftools.hxx,basegfx/numeric/ftools.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3i64tuple.hxx,basegfx/tuple/b3i64tuple.hxx)) $(eval $(call gb_Package_add_file,basegfx_inc,inc/basegfx/tuple/b3dtuple.hxx,basegfx/tuple/b3dtuple.hxx)) diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk index 79d6ed9..69616f7 100644 --- a/basegfx/StaticLibrary_basegfx_s.mk +++ b/basegfx/StaticLibrary_basegfx_s.mk @@ -72,6 +72,7 @@ $(WORKDIR)/CustomTarget/basegfx/source/%.cxx : $(SRCDIR)/basegfx/source/%.cxx $(eval $(call gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\ CustomTarget/basegfx/source/tools/liangbarsky \ CustomTarget/basegfx/source/tools/canvastools \ + CustomTarget/basegfx/source/tools/zoomtools \ CustomTarget/basegfx/source/tools/gradienttools \ CustomTarget/basegfx/source/tools/keystoplerp \ CustomTarget/basegfx/source/tools/unopolypolygon \ diff --git a/basegfx/inc/basegfx/tools/zoomtools.hxx b/basegfx/inc/basegfx/tools/zoomtools.hxx new file mode 100644 index 000..566418d --- /dev/null +++ b/basegfx/inc/basegfx/tools/zoomtools.hxx @@ -0,0 +1,52
[Libreoffice-commits] .: svx/inc
svx/inc/svx/zoom_def.hxx |5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) New commits: commit a18c8a06073650e12f3c1f9f8990670484ac5cf1 Author: Jan Holesovsky ke...@suse.cz Date: Mon Jan 23 15:27:45 2012 +0100 Let's use 2^(1/4) as the zoom factor, instead of 1.2 (thanks, Tor!) diff --git a/svx/inc/svx/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx index e194493..9f1a8ef 100644 --- a/svx/inc/svx/zoom_def.hxx +++ b/svx/inc/svx/zoom_def.hxx @@ -8,7 +8,8 @@ #endif -// zoom factor for Calc, Writer, Draw and Impress -#define ZOOM_FACTOR1.2 +// Zoom factor for Calc, Writer, Draw and Impress +// We use 2^(1/4) so that 4 steps lead to double / half size +#define ZOOM_FACTOR1.1892071150027210667175 /* 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] .: sc/source
sc/source/core/data/dpsdbtab.cxx |2 +-
sc/source/core/data/dpshttab.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d5bd33427f73d01d59e6021c7436d98d8c9fffd2
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Jan 13 08:57:46 2012 +0100
Fix MinGW build.
Cherry-picked from libreoffice-3-5 branch, probably a bit more helpful fail
message.
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 75dd964..576beb5 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -140,7 +140,7 @@ void ScDatabaseDPData::CreateCacheTable()
if (!aCacheTable.hasCache())
{
-OSL_FAIL(ScDatabaseDPData::CreateCacheTable: NOT GOOD!);
+OSL_FAIL(Cache table should be created with a live data cache
instance at all times.);
// This better not happen!! Cache table should be created with a live
// data cache instance at all times.
return;
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index cde9a27..7891eaa 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -192,7 +192,7 @@ void ScSheetDPData::CreateCacheTable()
if (!aCacheTable.hasCache())
{
-OSL_FAIL(ScSheetDPData::CreateCacheTable: NOT GOOD!!!);
+OSL_FAIL(Cache table should be created with a live data cache
instance at all times.);
// This better not happen!! The cache table should be created with a
// live data cache at all times.
return;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source sd/source svx/inc svx/source sw/source
sc/source/ui/view/prevwsh.cxx |7 +++
sc/source/ui/view/tabview.cxx |9 -
sd/source/ui/view/viewshel.cxx |8
svx/inc/svx/zoom_def.hxx |3 +++
svx/source/stbctrls/zoomsliderctrl.cxx |6 --
sw/source/ui/uiview/viewport.cxx |6 --
6 files changed, 22 insertions(+), 17 deletions(-)
New commits:
commit 022ce7d362f146ed69f54aae20cf2b8c582e9f8d
Author: Tim Hardeck thard...@suse.com
Date: Fri Jan 13 18:22:46 2012 +0100
fdo#44173: use a geometric progression for zooming
Zooming does now base on a geometric progression instead of an
arithmetic one.
Since the zoom factor is not only used in Draw but for all other
applications 1.2 seems like a good choice.
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index d76622a..b25a464 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -79,8 +79,7 @@
#include sc.hrc
#include scabstdlg.hxx
-// fuer Rad-Maus
-#define SC_DELTA_ZOOM 10
+// for mouse wheel
#define MINZOOM_SLIDER 10
#define MAXZOOM_SLIDER 400
@@ -449,9 +448,9 @@ sal_Bool ScPreviewShell::ScrollCommand( const CommandEvent
rCEvt )
long nOld = pPreview-GetZoom();
long nNew = nOld;
if ( pData-GetDelta() 0 )
-nNew = Max( (long) MINZOOM, (long)( nOld - SC_DELTA_ZOOM ) );
+nNew = Max( (long) MINZOOM, (long)round( nOld / ZOOM_FACTOR ));
else
-nNew = Min( (long) MAXZOOM, (long)( nOld + SC_DELTA_ZOOM ) );
+nNew = Min( (long) MAXZOOM, (long)round( nOld * ZOOM_FACTOR ));
if ( nNew != nOld )
{
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index a5fdf31..738aeec 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -149,15 +149,14 @@
#include string
#include algorithm
+#include svx/zoom_def.hxx
+
#define SPLIT_MARGIN30
#define SC_ICONSIZE 36
#define SC_SCROLLBAR_MIN30
#define SC_TABBAR_MIN 6
-// fuer Rad-Maus
-#define SC_DELTA_ZOOM 10
-
using namespace ::com::sun::star;
// STATIC DATA ---
@@ -1060,9 +1059,9 @@ bool ScTabView::ScrollCommand( const CommandEvent rCEvt,
ScSplitPos ePos )
long nOld = (long)(( rOldY.GetNumerator() * 100 ) /
rOldY.GetDenominator());
long nNew = nOld;
if ( pData-GetDelta() 0 )
-nNew = Max( (long) MINZOOM, (long)( nOld - SC_DELTA_ZOOM ) );
+nNew = Max( (long) MINZOOM, (long)round( nOld / ZOOM_FACTOR ));
else
-nNew = Min( (long) MAXZOOM, (long)( nOld + SC_DELTA_ZOOM ) );
+nNew = Min( (long) MAXZOOM, (long)round( nOld * ZOOM_FACTOR ));
if ( nNew != nOld )
{
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index 68ebe72..6c79ec2 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -82,6 +82,8 @@
#include sfx2/request.hxx
#include SpellDialogChildWindow.hxx
+#include svx/zoom_def.hxx
+
#include Window.hxx
#include fupoor.hxx
@@ -125,8 +127,6 @@ private:
namespace sd {
-static const int DELTA_ZOOM = 10;
-
sal_Bool ViewShell::IsPageFlipMode(void) const
{
return this-ISA(DrawViewShell) mpContentWindow.get() != NULL
@@ -718,9 +718,9 @@ bool ViewShell::HandleScrollCommand(const CommandEvent
rCEvt, ::sd::Window* pWi
longnNewZoom;
if( pData-GetDelta() 0L )
-nNewZoom = Max( (long) pWin-GetMinZoom(),
(long)(nOldZoom - DELTA_ZOOM) );
+nNewZoom = Max( (long) pWin-GetMinZoom(),
(long)round( nOldZoom / ZOOM_FACTOR ));
else
-nNewZoom = Min( (long) pWin-GetMaxZoom(),
(long)(nOldZoom + DELTA_ZOOM) );
+nNewZoom = Min( (long) pWin-GetMaxZoom(),
(long)round( nOldZoom * ZOOM_FACTOR ));
SetZoom( nNewZoom );
Invalidate( SID_ATTR_ZOOM );
diff --git a/svx/inc/svx/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx
index 0a24476..e194493 100644
--- a/svx/inc/svx/zoom_def.hxx
+++ b/svx/inc/svx/zoom_def.hxx
@@ -8,4 +8,7 @@
#endif
+// zoom factor for Calc, Writer, Draw and Impress
+#define ZOOM_FACTOR1.2
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/stbctrls/zoomsliderctrl.cxx
b/svx/source/stbctrls/zoomsliderctrl.cxx
index aa8ae8a..b270480 100644
--- a/svx/source/stbctrls/zoomsliderctrl.cxx
+++ b/svx/source/stbctrls/zoomsliderctrl.cxx
@@ -36,6 +36,8 @@
#include svx/dialmgr.hxx
#include svx/dialogs.hrc
+#include svx/zoom_def.hxx
+
#include set
// ---
@@ -357,11 +359,11 @@ sal_Bool
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/core/data/dpsdbtab.cxx |2 +-
sc/source/core/data/dpshttab.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d6f876434ff957ea6b5fd938fb3b779e4527c63f
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Jan 13 08:57:46 2012 +0100
Fix MinGW build.
diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx
index 1cfa2f8..576beb5 100644
--- a/sc/source/core/data/dpsdbtab.cxx
+++ b/sc/source/core/data/dpsdbtab.cxx
@@ -140,7 +140,7 @@ void ScDatabaseDPData::CreateCacheTable()
if (!aCacheTable.hasCache())
{
-fprintf(stdout, ScDatabaseDPData::CreateCacheTable: NOT GOOD!\n);
+OSL_FAIL(Cache table should be created with a live data cache
instance at all times.);
// This better not happen!! Cache table should be created with a live
// data cache instance at all times.
return;
diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx
index 14a6f7b..8832b23 100644
--- a/sc/source/core/data/dpshttab.cxx
+++ b/sc/source/core/data/dpshttab.cxx
@@ -192,7 +192,7 @@ void ScSheetDPData::CreateCacheTable()
if (!aCacheTable.hasCache())
{
-fprintf(stdout, ScSheetDPData::CreateCacheTable: NOT GOOD!!!\n);
+OSL_FAIL(Cache table should be created with a live data cache
instance at all times.);
// This better not happen!! The cache table should be created with a
// live data cache at all times.
return;
___
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/Executable_unopkg.bin.mk Repository.mk
Repository.mk | 11 +++ desktop/Executable_soffice.bin.mk |2 +- desktop/Executable_unopkg.bin.mk |2 +- 3 files changed, 9 insertions(+), 6 deletions(-) New commits: commit ee24a236e1ebcc9585ed8e24cd73512e76a0303d Author: Jan Holesovsky ke...@suse.cz Date: Wed Jan 11 09:37:09 2012 +0100 Revert OS_FOR_BUILD is not right do decide Host module name This reverts commit 39cfc4d8ad77700aefabaedde430693448a5f76f. This OS_FOR_BUILD is to modify behavior in the cross-compilation case. diff --git a/Repository.mk b/Repository.mk index 0724e43..3cc7a38 100644 --- a/Repository.mk +++ b/Repository.mk @@ -56,7 +56,6 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ -crashrep_com \ guiloader \ guistdio \ odbcconfig \ @@ -67,23 +66,27 @@ $(eval $(call gb_Helper_register_executables,OOO,\ sdraw \ simpress \ soffice \ - soffice_bin \ smath \ sweb \ swriter \ unoinfo \ unopkg \ -unopkg_bin \ -unopkg_com \ unopkgio \ )) else +ifeq ($(OS_FOR_BUILD),WNT) +$(eval $(call gb_Helper_register_executables,OOO,\ + soffice_bin \ +unopkg_bin \ +)) +else $(eval $(call gb_Helper_register_executables,OOO,\ soffice.bin \ unopkg.bin \ )) +endif ifeq ($(OS),MACOSX) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 8815432..456171d 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS),WNT) +ifeq ($(OS_FOR_BUILD),WNT) sofficebin := soffice_bin else sofficebin := soffice.bin diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index c635c2b..464824f 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS),WNT) +ifeq ($(OS_FOR_BUILD),WNT) unopkgbin := unopkg_bin else unopkgbin := unopkg.bin ___ 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/Executable_unopkg.bin.mk Repository.mk
Repository.mk | 11 --- desktop/Executable_soffice.bin.mk |2 +- desktop/Executable_unopkg.bin.mk |2 +- 3 files changed, 6 insertions(+), 9 deletions(-) New commits: commit 42bd571e07378c5e74f279e373c1442b4d224590 Author: Norbert Thiebaud nthieb...@gmail.com Date: Tue Jan 10 22:28:24 2012 -0600 OS_FOR_BUILD is not right do decide Host module name diff --git a/Repository.mk b/Repository.mk index 3cc7a38..f76ae79 100644 --- a/Repository.mk +++ b/Repository.mk @@ -56,6 +56,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ ifeq ($(OS),WNT) $(eval $(call gb_Helper_register_executables,OOO,\ + crashrep_com \ guiloader \ guistdio \ odbcconfig \ @@ -66,27 +67,23 @@ $(eval $(call gb_Helper_register_executables,OOO,\ sdraw \ simpress \ soffice \ + soffice_bin \ smath \ sweb \ swriter \ unoinfo \ unopkg \ + unopkg_bin \ + unopkg_com \ unopkgio \ )) else -ifeq ($(OS_FOR_BUILD),WNT) -$(eval $(call gb_Helper_register_executables,OOO,\ - soffice_bin \ -unopkg_bin \ -)) -else $(eval $(call gb_Helper_register_executables,OOO,\ soffice.bin \ unopkg.bin \ )) -endif ifeq ($(OS),MACOSX) diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk index 456171d..8815432 100644 --- a/desktop/Executable_soffice.bin.mk +++ b/desktop/Executable_soffice.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) sofficebin := soffice_bin else sofficebin := soffice.bin diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk index 464824f..c635c2b 100644 --- a/desktop/Executable_unopkg.bin.mk +++ b/desktop/Executable_unopkg.bin.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(OS),WNT) unopkgbin := unopkg_bin else unopkgbin := unopkg.bin ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: extensions/source
extensions/source/nsplugin/source/npshell.cxx | 24
1 file changed, 12 insertions(+), 12 deletions(-)
New commits:
commit 23b1ba968f0e092d78e98bebcfcf662b8442d711
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Jan 10 09:41:49 2012 +0100
Fix npshell build on Windows.
diff --git a/extensions/source/nsplugin/source/npshell.cxx
b/extensions/source/nsplugin/source/npshell.cxx
index 76dd7a8..cdb164b 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -69,7 +69,7 @@
#include boost/scoped_array.hpp
#include tools/pathutils.hxx
-#include npapi.h
+#include npsdk/npapi.h
#include npshell.hxx
#include so_env.hxx
#include so_msg.hxx
@@ -361,7 +361,7 @@ MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII
:odp:OpenDocument Presentation;
MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII :otp:OpenDocument
Presentation Template;
MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII :odf:OpenDocument Formula; );
-SAL_DLLPUBLIC_EXPORT char*
+char*
NPP_GetMIMEDescription(void)
{
debug_fprintf(NSP_LOG_APPEND, print by Netscape Plugin,
NPP_GetMIMEDescription:%s.\n, pMimeTypes);
@@ -435,7 +435,7 @@ NPP_Shutdown(void)
#endif
}
-SAL_DLLPUBLIC_EXPORT NPError
+NPError NP_LOADDS
NPP_New(NPMIMEType pluginType,
NPP instance,
uint16_t mode,
@@ -487,7 +487,7 @@ NPP_New(NPMIMEType pluginType,
return NPERR_NO_ERROR;
}
-SAL_DLLPUBLIC_EXPORT NPError
+NPError NP_LOADDS
NPP_Destroy(NPP instance, NPSavedData** /*save*/)
{
debug_fprintf(NSP_LOG_APPEND, print by Nsplugin, enter NPP_Destroy.\n);
@@ -532,7 +532,7 @@ NPP_Destroy(NPP instance, NPSavedData** /*save*/)
}
-SAL_DLLPUBLIC_EXPORT NPError
+NPError NP_LOADDS
NPP_SetWindow(NPP instance, NPWindow* window)
{
PluginInstance* This;
@@ -626,7 +626,7 @@ NPP_SetWindow(NPP instance, NPWindow* window)
}
-SAL_DLLPUBLIC_EXPORT NPError
+NPError NP_LOADDS
NPP_NewStream(NPP instance,
NPMIMEType /*type*/,
NPStream* /*stream*/,
@@ -648,21 +648,21 @@ int32_t STREAMBUFSIZE = 0X0FFF;
* mode so we can take any size stream in our
* write call (since we ignore it) */
-SAL_DLLPUBLIC_EXPORT int32_t
+int32_t NP_LOADDS
NPP_WriteReady(NPP /*instance*/, NPStream* /*stream*/)
{
return STREAMBUFSIZE;
}
-SAL_DLLPUBLIC_EXPORT int32_t
+int32_t NP_LOADDS
NPP_Write(NPP /*instance*/, NPStream* /*stream*/, int32_t /*offset*/, int32_t
len, void* /*buffer*/)
{
return len; /* The number of bytes accepted */
}
-SAL_DLLPUBLIC_EXPORT NPError
+NPError NP_LOADDS
NPP_DestroyStream(NPP instance, NPStream* /*stream*/, NPError /*reason*/)
{
if (instance == NULL)
@@ -671,7 +671,7 @@ NPP_DestroyStream(NPP instance, NPStream* /*stream*/,
NPError /*reason*/)
}
// save fname to another file with the original file name
-SAL_DLLPUBLIC_EXPORT void
+void NP_LOADDS
NPP_StreamAsFile(NPP instance, NPStream *stream, const char* fname)
{
debug_fprintf(NSP_LOG_APPEND, Into Stream\n);
@@ -812,14 +812,14 @@ NPP_StreamAsFile(NPP instance, NPStream *stream, const
char* fname)
debug_fprintf(NSP_LOG_APPEND, NPP_StreamAsFile send SO_SET_WINDOW
return failure \n);
}
-SAL_DLLPUBLIC_EXPORT void
+void NP_LOADDS
NPP_URLNotify(NPP /*instance*/, const char* /*url*/,
NPReason /*reason*/, void* /*notifyData*/)
{
}
-SAL_DLLPUBLIC_EXPORT void
+void NP_LOADDS
NPP_Print(NPP instance, NPPrint* printInfo)
{
if(printInfo == NULL)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/core/doc/docnew.cxx | 173 ++--
sw/source/core/doc/docnum.cxx | 198 --
2 files changed, 183 insertions(+), 188 deletions(-)
New commits:
commit d93196c815c77e9612423ceb81d4b39b79407e35
Author: Philipp Weissenbacher Philipp Weissenbacher
Date: Sun Jan 8 22:38:04 2012 +0100
Translate German comments and correct a few English ones
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index d5a609a..baa798d 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -120,8 +120,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule rRule )
// assure that the outline numbering rule is an automatic rule
pOutlineRule-SetAutoRule( sal_True );
-// teste ob die evt. gesetzen CharFormate in diesem Document
-// definiert sind
+// test whether the optional CharFormats are defined in this Document
pOutlineRule-CheckCharFmts( this );
// notify text nodes, which are registered at the outline style, about the
@@ -146,7 +145,7 @@ void SwDoc::SetOutlineNumRule( const SwNumRule rRule )
pOutlineRule-SetInvalidRule(sal_True);
UpdateNumRule();
-// gibt es Fussnoten gilt Kapitelweises Nummerieren, dann updaten
+// update if we have foot notes chapter-wise numbering
if( GetFtnIdxs().Count() FTNNUM_CHAPTER == GetFtnInfo().eNum )
GetFtnIdxs().UpdateAllFtn();
@@ -182,13 +181,13 @@ void SwDoc::PropagateOutlineRule()
}
}
-// Hoch-/Runterstufen
+// Increase/Decrease
sal_Bool SwDoc::OutlineUpDown( const SwPaM rPam, short nOffset )
{
if( !GetNodes().GetOutLineNds().Count() || !nOffset )
return sal_False;
-// den Bereich feststellen
+// calculate the area
const SwOutlineNodes rOutlNds = GetNodes().GetOutLineNds();
const SwNodePtr pSttNd = (SwNodePtr)rPam.Start()-nNode.GetNode();
const SwNodePtr pEndNd = (SwNodePtr)rPam.End()-nNode.GetNode();
@@ -196,19 +195,19 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM rPam, short
nOffset )
if( !rOutlNds.Seek_Entry( pSttNd, nSttPos )
!nSttPos-- )
-// wir stehen in keiner Outline-Section
+// we're not in an Outline section
return sal_False;
if( rOutlNds.Seek_Entry( pEndNd, nEndPos ) )
++nEndPos;
-// jetzt haben wir unseren Bereich im OutlineNodes-Array
-// dann prufe ersmal, ob nicht unterebenen aufgehoben werden
-// (Stufung ueber die Grenzen)
+// We now have the wanted area in the OutlineNodes array,
+// so check now if we're not invalidating sublevels
+// (stepping over the limits)
sal_uInt16 n;
-// so, dann koennen wir:
-// 1. Vorlagen-Array anlegen
+// Here we go:
+// 1. Create the Template array:
SwTxtFmtColl* aCollArr[ MAXLEVEL ];
memset( aCollArr, 0, sizeof( SwTxtFmtColl* ) * MAXLEVEL );
@@ -282,13 +281,11 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM rPam, short
nOffset )
/* -- #i13747#
- Build a move table that states from which level an outline will
+Build a move table that states from which level to which other level
+an outline will be moved.
- be moved to which other level. */
-
-/* the move table
-
- aMoveArr[n] = m: replace aCollArr[n] with aCollArr[m]
+the move table:
+aMoveArr[n] = m: replace aCollArr[n] with aCollArr[m]
*/
int aMoveArr[MAXLEVEL];
int nStep; // step size for searching in aCollArr: -1 or 1
@@ -380,7 +377,7 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM rPam, short
nOffset )
GetIDocumentUndoRedo().AppendUndo(pUndoOLR);
}
-// 2. allen Nodes die neue Vorlage zuweisen
+// 2. Apply the new Template to all Nodes
n = nSttPos;
while( n nEndPos)
@@ -427,10 +424,10 @@ sal_Bool SwDoc::OutlineUpDown( const SwPaM rPam, short
nOffset )
return sal_True;
}
-// Hoch-/Runter - Verschieben !
+// Move up/down
sal_Bool SwDoc::MoveOutlinePara( const SwPaM rPam, short nOffset )
{
-// kein Verschiebung in den Sonderbereichen
+// Do not move to special areas
const SwPosition rStt = *rPam.Start(),
rEnd = rStt == rPam.GetPoint() ? *rPam.GetMark()
: *rPam.GetPoint();
@@ -564,12 +561,12 @@ sal_Bool SwDoc::MoveOutlinePara( const SwPaM rPam, short
nOffset )
return sal_False;
OSL_ENSURE( aSttRg.GetIndex() nNewPos || nNewPos = aEndRg.GetIndex(),
-Position liegt im MoveBereich );
+Position lies within MoveArea );
-// wurde ein Position in den Sonderbereichen errechnet, dann
-// setze die Position auf den Dokumentanfang.
-// Sollten da Bereiche oder Tabellen stehen, so werden sie nach
-// hinten verschoben.
+// If a Position was calculated for the special area, we set it
+// to document start instead.
+// Areas or Tables at the document start
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - connectivity/source extensions/source
connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx | 29 +++--
connectivity/source/drivers/mozab/mozab.xcu|2
connectivity/source/drivers/mozab/mozab2.xcu |2
extensions/source/abpilot/abspilot.src |2
4 files changed, 19 insertions(+), 16 deletions(-)
New commits:
commit 3da441dfc06f0659e6dafc6dee16fbe74270e102
Author: Julien Nabet serval2...@yahoo.fr
Date: Mon Jan 9 23:56:33 2012 +0100
Enabling Icedove addressbook connection for Base (Thank you Caolan)
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
index 2921660..6382dfe 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx
@@ -69,24 +69,27 @@ namespace
}
// ---
-static const char* DefaultProductDir[3][3] =
+const size_t NB_PRODUCTS = 3;
+const size_t NB_CANDIDATES = 4;
+
+static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] =
{
#if defined(XP_WIN)
-{ Mozilla/SeaMonkey/, NULL, NULL },
-{ Mozilla/Firefox/, NULL, NULL },
-{ Thunderbird/, Mozilla/Thunderbird/, NULL }
+{ Mozilla/SeaMonkey/, NULL, NULL, NULL },
+{ Mozilla/Firefox/, NULL, NULL, NULL },
+{ Thunderbird/, Mozilla/Thunderbird/, NULL, NULL }
#elif(MACOSX)
-{ ../Mozilla/SeaMonkey/, NULL, NULL },
-{ Firefox/, NULL, NULL },
-{ ../Thunderbird/, NULL, NULL }
+{ ../Mozilla/SeaMonkey/, NULL, NULL, NULL },
+{ Firefox/, NULL, NULL, NULL },
+{ ../Thunderbird/, NULL, NULL, NULL }
#else
-{ .mozilla/seamonkey/, NULL, NULL },
-{ .mozilla/firefox/, NULL, NULL },
-{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/ }
+{ .mozilla/seamonkey/, NULL, NULL, NULL },
+{ .mozilla/firefox/, NULL, NULL, NULL },
+{ .thunderbird/, .mozilla-thunderbird/, .mozilla/thunderbird/,
.icedove }
#endif
};
-static const char* ProductRootEnvironmentVariable[3] =
+static const char* ProductRootEnvironmentVariable[NB_PRODUCTS] =
{
MOZILLA_PROFILE_ROOT,
MOZILLA_FIREFOX_PROFILE_ROOT,
@@ -98,7 +101,7 @@ namespace
{
size_t productIndex = _product - 1;
-static ::rtl::OUString s_productDirectories[3];
+static ::rtl::OUString s_productDirectories[NB_PRODUCTS];
if ( !s_productDirectories[ productIndex ].getLength() )
{
@@ -117,7 +120,7 @@ namespace
const char* pProfileRegistry = profiles.ini;
// check all possible candidates
-for ( size_t i=0; i3; ++i )
+for ( size_t i=0; iNB_CANDIDATES; ++i )
{
if ( NULL == DefaultProductDir[ productIndex ][ i ] )
break;
diff --git a/connectivity/source/drivers/mozab/mozab.xcu
b/connectivity/source/drivers/mozab/mozab.xcu
index fa732d6..e554e46 100644
--- a/connectivity/source/drivers/mozab/mozab.xcu
+++ b/connectivity/source/drivers/mozab/mozab.xcu
@@ -84,7 +84,7 @@
valuecom.sun.star.comp.sdbc.MozabDriver/value
/prop
prop oor:name=DriverTypeDisplayName oor:type=xs:string
-value xml:lang=en-USThunderbird Address Book/value
+value xml:lang=en-USThunderbird/Icedove Address Book/value
/prop
node oor:name=Features
node oor:name=EscapeDateTime oor:op=replace
diff --git a/connectivity/source/drivers/mozab/mozab2.xcu
b/connectivity/source/drivers/mozab/mozab2.xcu
index d1a620d..d6a6317 100644
--- a/connectivity/source/drivers/mozab/mozab2.xcu
+++ b/connectivity/source/drivers/mozab/mozab2.xcu
@@ -52,7 +52,7 @@
valuecom.sun.star.comp.sdbc.MozabDriver/value
/prop
prop oor:name=DriverTypeDisplayName oor:type=xs:string
-value xml:lang=en-USThunderbird Address Book/value
+value xml:lang=en-USThunderbird/Icedove Address Book/value
/prop
node oor:name=MetaData
node oor:name=SupportsBrowsing oor:op=replace
diff --git a/extensions/source/abpilot/abspilot.src
b/extensions/source/abpilot/abspilot.src
index 289e466..c246af9 100644
--- a/extensions/source/abpilot/abspilot.src
+++ b/extensions/source/abpilot/abspilot.src
@@ -120,7 +120,7 @@ TabPage RID_PAGE_SELECTABTYPE
{
HelpID = extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_THUNDERBIRD;
Size= MAP_APPFONT ( WINDOW_SIZE_X - 30, 8 ) ;
-Text [ en-US ] = Thunderbird;
+Text [ en-US ] = Thunderbird/Icedove;
};
RadioButton RB_KAB
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - svtools/inc svtools/source
svtools/inc/svtools/valueset.hxx| 218 +--- svtools/source/control/valueset.cxx | 101 +++- 2 files changed, 151 insertions(+), 168 deletions(-) New commits: commit 9ec31184f7d68777b601f3398c1dae930b7ead42 Author: Tim Hardeck thard...@suse.com Date: Thu Jan 5 14:15:37 2012 +0100 translated German comments in valueset.hxx Translated German comments in svtools/inc/svtools/valueset.hxx. diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx index ad78ce8..54e8319 100644 --- a/svtools/inc/svtools/valueset.hxx +++ b/svtools/inc/svtools/valueset.hxx @@ -54,24 +54,23 @@ class ValueItemAcc; /* -Beschreibung +Description class ValueSet -Diese Klasse erlaubt die Auswahl eines Items. Dabei werden die Items -nebeneinander dargestellt. Die Auswahl der Items kann zum Beispiel bei -Farben oder Mustern uebersichtlicher sein, als in ListBox-Form. Es kann -angegeben werden, wieviele Spalten das Control anzeigen soll und ob die -Items umrandet werden sollen oder nicht. Optional kann auch ein -NoSelection-Feld oder ein Namenfeld angezeigt werden. An Items werden -standardmaessig Image, und Color unterstuetzt. Falls InsertItem() -nur mit einer ID aufgerufen wird, kann man die Items auch selber malen. -Dazu muss dann jedoch der UserDraw-Handler ueberlagert werden. Bei -UserDraw-Items, wie auch bei allen anderen Items kann der Beschreibungstext -auch hinterher gesetzt bzw. umgesetzt werden. +This class allows the selection of an item. In the process items are +drawn side by side. The selection of items can be more clear than in a +ListBox shape for example in case of colors or samples. +The amount of columns drawn by the control and wether the items +should be encircled can be specified. Optional a NoSelection or name +field could be shown. By default image and color items are supported. +Items could be drawn by oneself if InsertItem() is only called with +an ID. To achieve this the UserDraw handler needs to be overloaded. The +description text could be specified afterwards in case of UserDraw +and any other items. -Querverweise +Cross references class ListBox @@ -79,129 +78,118 @@ class ListBox WinBits -WB_RADIOSEL Wenn dieses Flag gesetzt wird, wird im ValueSet die -Selektion so gezeichnet, wie bei einem ImageRadioButton. -Dies ist jedoch nur sinnvoll, wenn die Images min. 8 Pixel -in horizontaler und vertikaler Richtung kleiner sind -als der Item-Bereich, WB_DOUBLEBORDER gesetzt ist und -als Color COL_WINDOWWORKSPACE gesetzt ist. +WB_RADIOSEL If set the selection will be drawn like an +ImageRadioButton. This does only make sense if the image +is at least 8 pixel smaller on each side than the item +and also WB_DOUBLEBORDER is set and as color +COL_WINDOWWORKSPACE is specified. WB_FLATVALUESET Flat Look (if you set WB_ITEMBORDER or WB_DOUBLEBORDER, then you get extra border space, but the Borders aren't painted), -WB_ITEMBORDER Die Items werden umrandet -WB_DOUBLEBORDER Die Items werden doppelt umrandet. Zusaetzlich muss -WB_ITEMBORDER gesetzt werden, ansonsten hat dieses -WinBit keine Auswirkung. Gebraucht wird dies, wenn man -Items mit weissem Hintergrund hat, da sonst der 3D Effekt -nicht mehr sichtbar ist. -WB_NAMEFIELDEs gibt ein Namensfeld, wo der Name eines Items -mit angezeigt wird -WB_NONEFIELDEs gibt ein NoSelection-Feld. Dieses kann selektiert -werden, wenn bei SelectItem 0 uebergeben wird. Bei -GetSelectItemId() wird entsprechend 0 zurueckgegeben -wenn dieses Feld selektiert ist, bzw. keines selektiert -wurde. Dieses Feld zeigt den Text an, der mit SetText() -gesetzt wurde, bzw. keinen, wenn kein Text gesetzt -wurde. Mit SetNoSelection() kann die Selektion ganz -ausgeschaltet werden. -WB_VSCROLL Es wird immer ein ScrollBar angezeigt. Wenn dieses Flag -gesetzt wird, muss auch immer mit SetLineCount() die -sichtbare Anzahl der Zeilen eingestellt werden. -WB_BORDER Um das Fenster wird ein Border gezeichnet. -WB_NOPOINTERFOCUS Der Focus wird sich nicht geholt, wenn mit der Maus in -das Control geklickt wird. -WB_TABSTOP Mit der TabTaste kann in das ValueSet gesprungen werden. -WB_NOTABSTOPMit der TabTaste kann nicht in das ValueSet gesprungen -werden. +WB_ITEMBORDER Items will be bordered
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - cairo/cairo cairo/cairo.dlsym.lcdfilter.patch
cairo/cairo.dlsym.lcdfilter.patch | 56 ++
cairo/cairo/makefile.mk |4 ++
2 files changed, 59 insertions(+), 1 deletion(-)
New commits:
commit d58120ef8b3012087c92406fc1dd4858df3807d0
Author: Caolán McNamara caol...@redhat.com
Date: Fri Jan 6 09:37:16 2012 +
Resolves: fdo#44219 RHEL-4 buildbox doesn't have FT_Library_SetLcdFilter
diff --git a/cairo/cairo.dlsym.lcdfilter.patch
b/cairo/cairo.dlsym.lcdfilter.patch
new file mode 100644
index 000..46f7ac7
--- /dev/null
+++ b/cairo/cairo.dlsym.lcdfilter.patch
@@ -0,0 +1,56 @@
+--- misc/cairo-1.10.2/src/cairo-ft-font.c 2012-01-06 09:09:21.500373823
+
misc/build/cairo-1.10.2/src/cairo-ft-font.c2012-01-06
09:31:01.645238786 +
+@@ -59,6 +59,8 @@
+
+ #if HAVE_FT_LIBRARY_SETLCDFILTER
+ #include FT_LCD_FILTER_H
++#elif HAVE_DLFCN_H
++#include dlfcn.h
+ #endif
+
+ /* Fontconfig version older than 2.6 didn't have these options */
+@@ -1217,6 +1219,26 @@
+ return CAIRO_STATUS_SUCCESS;
+ }
+
++static void try_FT_Library_SetLcdFilter( FT_Library library,
++int lcd_filter )
++{
++#if HAVE_FT_LIBRARY_SETLCDFILTER
++FT_Library_SetLcdFilter (library, lcd_filter);
++#elif HAVE_DLFCN_H
++static void (*pFT_Library_SetLcdFilter) (FT_Library, int);
++static int dlsymed = 0;
++
++if (!dlsymed)
++{
++pFT_Library_SetLcdFilter = dlsym(RTLD_DEFAULT,
FT_Library_SetLcdFilter);
++dlsymed = 1;
++}
++
++if (pFT_Library_SetLcdFilter)
++ (*pFT_Library_SetLcdFilter) (library, lcd_filter);
++#endif
++}
++
+ /* Converts an outline FT_GlyphSlot into an image
+ *
+ * This could go through _render_glyph_bitmap as well, letting
+@@ -1350,15 +1372,11 @@
+ break;
+ }
+
+-#if HAVE_FT_LIBRARY_SETLCDFILTER
+- FT_Library_SetLcdFilter (library, lcd_filter);
+-#endif
++ try_FT_Library_SetLcdFilter(library, lcd_filter);
+
+ fterror = FT_Render_Glyph (face-glyph, render_mode);
+
+-#if HAVE_FT_LIBRARY_SETLCDFILTER
+- FT_Library_SetLcdFilter (library, FT_LCD_FILTER_NONE);
+-#endif
++ try_FT_Library_SetLcdFilter(library, FT_LCD_FILTER_NONE);
+
+ if (fterror != 0)
+ return _cairo_error (CAIRO_STATUS_NO_MEMORY);
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index fc0111c..3abc352 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -47,7 +47,9 @@ CAIROVERSION=1.10.2
TARFILE_NAME=$(PRJNAME)-$(CAIROVERSION)
TARFILE_MD5=f101a9e88b783337b20b2e26dfd26d5f
-PATCH_FILES=..$/$(TARFILE_NAME).patch
+PATCH_FILES=\
+..$/cairo-1.10.2.patch \
+..$/cairo.dlsym.lcdfilter.patch
.IF $(OS)$(COM) == WNTMSC
PATCH_FILES+= ..$/$(TARFILE_NAME).wntmsc.patch
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sw/source
sw/source/ui/docvw/HeaderFooterWin.cxx | 14 +++-
sw/source/ui/docvw/PageBreakWin.cxx| 108 ++---
sw/source/ui/inc/HeaderFooterWin.hxx |1
sw/source/ui/inc/PageBreakWin.hxx |3
4 files changed, 37 insertions(+), 89 deletions(-)
New commits:
commit 60c968e9a2ef14aa289e677bd7f40d2c4724fd12
Author: Jan Holesovsky ke...@suse.cz
Date: Sat Jan 7 04:27:25 2012 +0100
Page Breaks: IsLeaveWindow() is unreliable, we do not need it here.
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index 0edeb61..ff5050b 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -83,17 +83,11 @@ namespace
void SwBreakDashedLine::MouseMove( const MouseEvent rMEvt )
{
-if ( rMEvt.IsLeaveWindow() )
-{
-// don't fade if we just move to the 'button'
-Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
-if ( !m_pWin-Contains( aEventPos ) )
-m_pWin-Fade( false );
-}
+Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !m_pWin-Contains( aEventPos ) )
+m_pWin-Fade( false );
else if ( !m_pWin-IsVisible() )
-{
m_pWin-Fade( true );
-}
if ( !rMEvt.IsSynthetic() )
{
@@ -309,13 +303,9 @@ void SwPageBreakWin::Select( )
void SwPageBreakWin::MouseMove( const MouseEvent rMEvt )
{
-if ( rMEvt.IsLeaveWindow() )
-{
-// don't fade if we just move to the 'line', or the popup menu is open
-Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() );
-if ( !Contains( aEventPos ) !PopupMenu::IsInExecute() )
-Fade( false );
-}
+Point aEventPos( rMEvt.GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !Contains( aEventPos ) !PopupMenu::IsInExecute() )
+Fade( false );
else if ( !IsVisible() )
Fade( true );
}
commit aa3bfbe776bcefd7e7b143e6843315df6b2a5ecb
Author: Jan Holesovsky ke...@suse.cz
Date: Sat Jan 7 04:16:44 2012 +0100
Header/Footer, Page Breaks: Delay appearing by 500ms.
The delay was a good idea, just the 1s was too long.
diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx
b/sw/source/ui/docvw/HeaderFooterWin.cxx
index ff7d50e..330c1ff 100644
--- a/sw/source/ui/docvw/HeaderFooterWin.cxx
+++ b/sw/source/ui/docvw/HeaderFooterWin.cxx
@@ -153,6 +153,7 @@ SwHeaderFooterWin::SwHeaderFooterWin( SwEditWin* pEditWin,
const SwPageFrm* pPag
m_pLine( NULL ),
m_bIsAppearing( false ),
m_nFadeRate( 100 ),
+m_nDelayAppearing( 0 ),
m_aFadeTimer( )
{
// Get the font and configure it
@@ -243,6 +244,9 @@ void SwHeaderFooterWin::ShowAll( bool bShow )
if ( !PopupMenu::IsInExecute() )
{
m_bIsAppearing = bShow;
+if ( bShow )
+m_nDelayAppearing = 0;
+
if ( m_aFadeTimer.IsActive( ) )
m_aFadeTimer.Stop();
m_aFadeTimer.Start( );
@@ -516,6 +520,14 @@ void SwHeaderFooterWin::Select( )
IMPL_LINK( SwHeaderFooterWin, FadeHandler, Timer *, EMPTYARG )
{
+const int TICKS_BEFORE_WE_APPEAR = 10;
+if ( m_bIsAppearing m_nDelayAppearing TICKS_BEFORE_WE_APPEAR )
+{
+++m_nDelayAppearing;
+m_aFadeTimer.Start();
+return 0;
+}
+
if ( m_bIsAppearing m_nFadeRate 0 )
m_nFadeRate -= 25;
else if ( !m_bIsAppearing m_nFadeRate 100 )
@@ -535,7 +547,7 @@ IMPL_LINK( SwHeaderFooterWin, FadeHandler, Timer *,
EMPTYARG )
Invalidate();
if ( IsVisible( ) m_nFadeRate 0 m_nFadeRate 100 )
-m_aFadeTimer.Start();
+m_aFadeTimer.Start();
return 0;
}
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index 0617101..0edeb61 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -110,6 +110,7 @@ SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const
SwPageFrm* pPageFrm )
m_pLine( NULL ),
m_bIsAppearing( false ),
m_nFadeRate( 100 ),
+m_nDelayAppearing( 0 ),
m_bDestroyed( false ),
m_pMousePt( NULL )
{
@@ -424,6 +425,9 @@ void SwPageBreakWin::SetReadonly( bool bReadonly )
void SwPageBreakWin::Fade( bool bFadeIn )
{
m_bIsAppearing = bFadeIn;
+if ( bFadeIn )
+m_nDelayAppearing = 0;
+
if ( !m_bDestroyed m_aFadeTimer.IsActive( ) )
m_aFadeTimer.Stop();
if ( !m_bDestroyed )
@@ -439,6 +443,14 @@ IMPL_LINK( SwPageBreakWin, HideHandler, void *, EMPTYARG )
IMPL_LINK( SwPageBreakWin, FadeHandler, Timer *, EMPTYARG )
{
+const int TICKS_BEFORE_WE_APPEAR = 10;
+if ( m_bIsAppearing m_nDelayAppearing TICKS_BEFORE_WE_APPEAR )
+{
+++m_nDelayAppearing;
+m_aFadeTimer.Start();
+return 0;
+}
+
if ( m_bIsAppearing m_nFadeRate 0 )
m_nFadeRate -= 25;
else if ( !m_bIsAppearing m_nFadeRate 100 )
diff --git
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - extensions/qa extensions/source
extensions/qa/update/simple.xml |6 ++--
extensions/qa/update/test_update.cxx | 27 +++---
extensions/source/update/check/updateprotocol.cxx | 14 +--
extensions/source/update/check/updateprotocol.hxx |1
4 files changed, 40 insertions(+), 8 deletions(-)
New commits:
commit 953b7f9e1ba665b4763fac8f83113f43b6d49b39
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Jan 4 19:25:57 2012 +0100
Online update: Introduce inst:gitid to check exactly if we are the same.
This allows to feed updates via a static .xml in a controlled environment.
diff --git a/extensions/qa/update/simple.xml b/extensions/qa/update/simple.xml
index 6a6af12..7900397 100644
--- a/extensions/qa/update/simple.xml
+++ b/extensions/qa/update/simple.xml
@@ -1,8 +1,8 @@
?xml version=1.0 encoding=utf-8?
inst:description xmlns:inst=http://update.libreoffice.org/description;
- inst:idLibreOffice_3.4/inst:id
- inst:version3.4.2/inst:version
- inst:buildid102/inst:buildid
+ inst:idLibreOffice 3.5.0 Beta2/inst:id
+ inst:version3.5.0 Beta2/inst:version
+ inst:gitid123456-abcdef-1a2b3c-4d5e6f/inst:gitid
inst:osLinux/inst:os
inst:archx86/inst:arch
diff --git a/extensions/qa/update/test_update.cxx
b/extensions/qa/update/test_update.cxx
index bed67d3..af93e66 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -121,8 +121,8 @@ protected:
CPPUNIT_FAIL( Wrong type of the entry. );
}
-// test the checkForUpdates() method
-void testCheckForUpdates()
+// test the checkForUpdates() method - update is available
+void testCheckUpdateAvailable()
{
UpdateInfo aInfo;
rtl::Reference UpdateCheck aController( UpdateCheck::get() );
@@ -131,6 +131,7 @@ protected:
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Linux ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x86 ) ),
m_aRepositoryList,
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
11-22-33-44 ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( InstallSetID
) ) ) )
{
CPPUNIT_ASSERT( aInfo.Sources.size() == 1 );
@@ -140,9 +141,29 @@ protected:
CPPUNIT_FAIL( Calling checkForUpdates() failed. );
}
+// test the checkForUpdates() method - we are up-to-date
+void testCheckUpToDate()
+{
+UpdateInfo aInfo;
+rtl::Reference UpdateCheck aController( UpdateCheck::get() );
+
+if ( checkForUpdates( aInfo, m_xContext,
aController-getInteractionHandler(), m_xProvider,
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Linux ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x86 ) ),
+m_aRepositoryList,
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
123456-abcdef-1a2b3c-4d5e6f ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( InstallSetID
) ) ) )
+{
+CPPUNIT_ASSERT( aInfo.Sources.size() == 0 );
+}
+else
+CPPUNIT_FAIL( Calling checkForUpdates() failed. );
+}
+
CPPUNIT_TEST_SUITE(Test);
CPPUNIT_TEST(testGetUpdateInformationEnumeration);
-CPPUNIT_TEST(testCheckForUpdates);
+CPPUNIT_TEST(testCheckUpdateAvailable);
+CPPUNIT_TEST(testCheckUpToDate);
CPPUNIT_TEST_SUITE_END();
private:
diff --git a/extensions/source/update/check/updateprotocol.cxx
b/extensions/source/update/check/updateprotocol.cxx
index b0a20ab..2e9ec20 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -59,8 +59,14 @@ namespace xml = css::xml ;
static bool
getBootstrapData(
uno::Sequence ::rtl::OUString rRepositoryList,
+::rtl::OUString rGitID,
::rtl::OUString rInstallSetID)
{
+rGitID = UNISTRING( ${$BRAND_BASE_DIR/program/ SAL_CONFIGFILE(version)
:buildid} );
+rtl::Bootstrap::expandMacros( rGitID );
+if ( rGitID.isEmpty() )
+return false;
+
rInstallSetID = UNISTRING( ${$BRAND_BASE_DIR/program/
SAL_CONFIGFILE(version) :UpdateID} );
rtl::Bootstrap::expandMacros( rInstallSetID );
if ( ! rInstallSetID.getLength() )
@@ -97,14 +103,15 @@ checkForUpdates(
rtl::Bootstrap::get(UNISTRING(_ARCH), myArch);
uno::Sequence ::rtl::OUString aRepositoryList;
+::rtl::OUString aGitID;
::rtl::OUString aInstallSetID;
-if( ! ( getBootstrapData(aRepositoryList, aInstallSetID)
(aRepositoryList.getLength() 0) ) )
+if( ! ( getBootstrapData(aRepositoryList, aGitID, aInstallSetID)
(aRepositoryList.getLength() 0) ) )
return false;
return checkForUpdates( o_rUpdateInfo, rxContext, rxInteractionHandler,
rUpdateInfoProvider,
myOS, myArch,
-aRepositoryList, aInstallSetID );
+aRepositoryList, aGitID, aInstallSetID
[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeWin32.conf extensions/qa extensions/source
distro-configs/LibreOfficeLinux.conf |1 +
distro-configs/LibreOfficeMacOSX.conf |1 +
distro-configs/LibreOfficeWin32.conf |1 +
extensions/qa/update/test_update.cxx |1 -
extensions/source/update/check/updateprotocol.cxx | 16 +++-
extensions/source/update/check/updateprotocol.hxx |1 -
6 files changed, 6 insertions(+), 15 deletions(-)
New commits:
commit 9cb07807ca3a8c3c53a7d5241258aab2b4e4305b
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Jan 2 19:14:06 2012 +0100
Online update: Enable online update even for the Linux release builds.
[and mention it explicitly in the Windows and Mac distro configs, to be
safe :-)]
diff --git a/distro-configs/LibreOfficeLinux.conf
b/distro-configs/LibreOfficeLinux.conf
index 1a4ab2e..f498df0 100644
--- a/distro-configs/LibreOfficeLinux.conf
+++ b/distro-configs/LibreOfficeLinux.conf
@@ -41,6 +41,7 @@
--enable-cairo
--enable-binfilter
--enable-python=internal
+--enable-online-update
--disable-unix-qstart-libpng
--disable-randr-link
--disable-kde4
diff --git a/distro-configs/LibreOfficeMacOSX.conf
b/distro-configs/LibreOfficeMacOSX.conf
index 59ea95b..7e7af46 100644
--- a/distro-configs/LibreOfficeMacOSX.conf
+++ b/distro-configs/LibreOfficeMacOSX.conf
@@ -12,4 +12,5 @@
--enable-ext-nlpsolver
--enable-ext-postgresql-sdbc
--enable-extension-integration
+--enable-online-update
--without-system-postgresql
diff --git a/distro-configs/LibreOfficeWin32.conf
b/distro-configs/LibreOfficeWin32.conf
index 10d7f12..fc267e2 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -17,3 +17,4 @@
--enable-ext-pdfimport
--enable-ext-nlpsolver
--enable-ext-postgresql-sdbc
+--enable-online-update
commit adad42f4401dec83ad78218b40fdfc71731ce214
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Jan 2 19:02:46 2012 +0100
Online update: Don't check for buildid at the user's end.
We want more freedom in what to offer to the user; at some stage we would
like
to offer 3.6 to the users using 3.5 which would be harder with this buildid
check.
This makes the server side responsible for offering the correct version; but
that should be fine because all the versions that we are able to update must
be listed on the server: what is not listed is considered up-to-date.
diff --git a/extensions/qa/update/test_update.cxx
b/extensions/qa/update/test_update.cxx
index 84cbc4f..bed67d3 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -131,7 +131,6 @@ protected:
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Linux ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x86 ) ),
m_aRepositoryList,
-rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 100 ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( InstallSetID
) ) ) )
{
CPPUNIT_ASSERT( aInfo.Sources.size() == 1 );
diff --git a/extensions/source/update/check/updateprotocol.cxx
b/extensions/source/update/check/updateprotocol.cxx
index bc268e8..187a665 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -59,14 +59,8 @@ namespace xml = css::xml ;
static bool
getBootstrapData(
uno::Sequence ::rtl::OUString rRepositoryList,
-::rtl::OUString rBuildID,
::rtl::OUString rInstallSetID)
{
-rBuildID = UNISTRING( ${$BRAND_BASE_DIR/program/
SAL_CONFIGFILE(version) :ProductBuildid} );
-rtl::Bootstrap::expandMacros( rBuildID );
-if ( rBuildID.isEmpty() )
-return false;
-
rInstallSetID = UNISTRING( ${$BRAND_BASE_DIR/program/
SAL_CONFIGFILE(version) :UpdateID} );
rtl::Bootstrap::expandMacros( rInstallSetID );
if ( rInstallSetID.isEmpty() )
@@ -103,15 +97,14 @@ checkForUpdates(
rtl::Bootstrap::get(UNISTRING(_ARCH), myArch);
uno::Sequence ::rtl::OUString aRepositoryList;
-::rtl::OUString aBuildID;
::rtl::OUString aInstallSetID;
-if( ! ( getBootstrapData(aRepositoryList, aBuildID, aInstallSetID)
(aRepositoryList.getLength() 0) ) )
+if( ! ( getBootstrapData(aRepositoryList, aInstallSetID)
(aRepositoryList.getLength() 0) ) )
return false;
return checkForUpdates( o_rUpdateInfo, rxContext, rxInteractionHandler,
rUpdateInfoProvider,
myOS, myArch,
-aRepositoryList, aBuildID, aInstallSetID );
+aRepositoryList, aInstallSetID );
}
bool
@@ -123,7 +116,6 @@ checkForUpdates(
const rtl::OUString rOS,
const rtl::OUString rArch,
const uno::Sequence rtl::OUString rRepositoryList,
-const rtl::OUString rBuildID,
const rtl::OUString rInstallSetID )
{
if( !rxContext.is() )
@@ -155,9 +147,7 @@ checkForUpdates(
aBuffer.append( rOS );
aBuffer.appendAscii(\' and inst:arch
[Libreoffice-commits] .: forms/source
forms/source/component/CheckBox.cxx |2 -
forms/source/component/Columns.cxx |4 +--
forms/source/component/ComboBox.cxx | 16 ++---
forms/source/component/Currency.cxx |2 -
forms/source/component/DatabaseForm.cxx | 24 ++--
forms/source/component/Edit.cxx |8 +++---
forms/source/component/EditBase.cxx |2 -
forms/source/component/Filter.cxx| 10
forms/source/component/FormComponent.cxx | 32 +--
forms/source/component/FormattedField.cxx|6 ++---
forms/source/component/GroupManager.cxx |6 ++---
forms/source/component/ImageControl.cxx | 12 +-
forms/source/component/ListBox.cxx | 12 +-
forms/source/component/Pattern.cxx |4 +--
forms/source/component/RadioButton.cxx |8 +++---
forms/source/component/clickableimage.cxx|8 +++---
forms/source/component/errorbroadcaster.cxx |2 -
forms/source/component/imgprod.cxx |2 -
forms/source/component/refvaluecomponent.cxx |2 -
forms/source/inc/forms_module_impl.hxx |2 -
forms/source/runtime/formoperations.cxx |8 +++---
forms/source/xforms/binding.cxx | 16 ++---
forms/source/xforms/convert.cxx |2 -
forms/source/xforms/datatypes.cxx|6 ++---
forms/source/xforms/model.cxx|2 -
forms/source/xforms/model_ui.cxx | 12 +-
forms/source/xforms/pathexpression.cxx |2 -
forms/source/xforms/resourcehelper.cxx |2 -
forms/source/xforms/submission.cxx |8 +++---
29 files changed, 111 insertions(+), 111 deletions(-)
New commits:
commit 6cfae09e5dafa477db210272949e253d4fb24349
Author: Gustavo Buzzatti Pacheco gbpach...@gmail.com
Date: Mon Dec 26 15:08:46 2011 -0200
Fix for fdo43460 Part XVIII getLength() to isEmpty()
Part XVIII
module
form
diff --git a/forms/source/component/CheckBox.cxx
b/forms/source/component/CheckBox.cxx
index b0dd35f..3a622e2 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -206,7 +206,7 @@ void SAL_CALL OCheckBoxModel::read(const
Referencestario::XObjectInputStream
setDefaultChecked( static_cast ToggleState ( nDefaultChecked ) );
// Nach dem Lesen die Defaultwerte anzeigen
-if ( getControlSource().getLength() )
+if ( !getControlSource().isEmpty() )
// (not if we don't have a control source - the State property acts
like it is persistent, then
resetNoBroadcast();
}
diff --git a/forms/source/component/Columns.cxx
b/forms/source/component/Columns.cxx
index 72a5344..d65eac4 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -75,7 +75,7 @@ const sal_uInt16 COMPATIBLE_HIDDEN = 0x0008;
const StringSequence getColumnTypes()
{
static StringSequence aColumnTypes(10);
-if (!aColumnTypes.getConstArray()[0].getLength())
+if (aColumnTypes.getConstArray()[0].isEmpty())
{
::rtl::OUString* pNames = aColumnTypes.getArray();
pNames[TYPE_CHECKBOX] = ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( CheckBox ) );
@@ -218,7 +218,7 @@ OGridColumn::OGridColumn( const
comphelper::ComponentContext _rContext, const :
DBG_CTOR(OGridColumn,NULL);
// Anlegen des UnoControlModels
-if ( m_aModelName.getLength() )// is there a to-be-aggregated model?
+if ( !m_aModelName.isEmpty() )// is there a to-be-aggregated model?
{
increment( m_refCount );
diff --git a/forms/source/component/ComboBox.cxx
b/forms/source/component/ComboBox.cxx
index 6224c5b..e16a452 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -455,7 +455,7 @@ void SAL_CALL OComboBoxModel::read(const
Referencestario::XObjectInputStream
// Stringliste muss geleert werden, wenn eine Listenquelle gesetzt ist
// dieses kann der Fall sein wenn im alive modus gespeichert wird
-if ( m_aListSource.getLength()
+if ( !m_aListSource.isEmpty()
!hasExternalListSource()
)
{
@@ -469,7 +469,7 @@ void SAL_CALL OComboBoxModel::read(const
Referencestario::XObjectInputStream
readCommonProperties(_rxInStream);
// Nach dem Lesen die Defaultwerte anzeigen
-if ( getControlSource().getLength() )
+if ( !getControlSource().isEmpty() )
{
// (not if we don't have a control source - the State property acts
like it is persistent, then
resetNoBroadcast();
@@ -500,7 +500,7 @@ void OComboBoxModel::loadData( bool _bForce )
return;
}
-if (!m_aListSource.getLength() || m_eListSourceType ==
ListSourceType_VALUELIST)
+if (m_aListSource.isEmpty() || m_eListSourceType ==
ListSourceType_VALUELIST)
return;
::utl::SharedUNOComponent
[Libreoffice-commits] .: i18npool/source idlc/source idl/source io/source javaunohelper/source jvmaccess/source
i18npool/source/breakiterator/breakiteratorImpl.cxx |4
i18npool/source/breakiterator/breakiterator_unicode.cxx |2
i18npool/source/collator/collator_unicode.cxx |2
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |2
i18npool/source/indexentry/indexentrysupplier.cxx |4
i18npool/source/indexentry/indexentrysupplier_asian.cxx |2
i18npool/source/indexentry/indexentrysupplier_common.cxx |2
i18npool/source/indexentry/indexentrysupplier_default.cxx |8 -
i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx |2
i18npool/source/isolang/isolang.cxx | 12 +-
i18npool/source/isolang/mslangid.cxx |8 -
i18npool/source/localedata/LocaleNode.cxx | 54
+-
i18npool/source/localedata/localedata.cxx |2
i18npool/source/paper/paper.cxx |8 -
i18npool/source/search/textsearch.cxx |2
i18npool/source/transliteration/transliteration_Ignore.cxx|4
i18npool/source/transliteration/transliteration_body.cxx |2
idl/source/prj/database.cxx |4
idl/source/prj/svidl.cxx |4
idlc/source/astdeclaration.cxx|4
idlc/source/astdump.cxx |8 -
idlc/source/astscope.cxx |4
idlc/source/errorhandler.cxx |2
idlc/source/idlccompile.cxx |4
io/source/acceptor/acceptor.cxx |4
javaunohelper/source/javaunohelper.cxx|2
jvmaccess/source/classpath.cxx|2
27 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit a17fb882569046cd9f6940cf2e87435200bb666b
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Mon Dec 26 17:19:24 2011 -0200
Fix for fdo43460 Part XXI getLength() to isEmpty()
Part XXI
Modules
i18npool, idl, idlc, io, javaunohelper, jvmaccess
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx
b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index f7690c1..1d26968 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -231,7 +231,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::beginOfSentence(
const OUString Text, sal
{
if (nStartPos 0 || nStartPos Text.getLength())
return -1;
-if (Text.getLength() == 0) return 0;
+if (Text.isEmpty()) return 0;
return LBI-beginOfSentence(Text, nStartPos, rLocale);
}
@@ -240,7 +240,7 @@ sal_Int32 SAL_CALL BreakIteratorImpl::endOfSentence( const
OUString Text, sal_I
{
if (nStartPos 0 || nStartPos Text.getLength())
return -1;
-if (Text.getLength() == 0) return 0;
+if (Text.isEmpty()) return 0;
return LBI-endOfSentence(Text, nStartPos, rLocale);
}
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 78ba7a6..5f35795 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -129,7 +129,7 @@ void SAL_CALL
BreakIterator_Unicode::loadICUBreakIterator(const com::sun::star::
OOoRuleBasedBreakIterator *rbi = NULL;
-if (breakRules.getLength() breakType
breakRules[breakType].getLength() 0) {
+if (breakRules.getLength() breakType
!breakRules[breakType].isEmpty()) {
rbi = new OOoRuleBasedBreakIterator(udata_open(OpenOffice,
brk,
OUStringToOString(breakRules[breakType],
RTL_TEXTENCODING_ASCII_US).getStr(), status), status);
} else {
diff --git a/i18npool/source/collator/collator_unicode.cxx
b/i18npool/source/collator/collator_unicode.cxx
index 6eebd6f..0488d59 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.cxx
@@ -79,7 +79,7 @@ Collator_Unicode::loadCollatorAlgorithm(const OUString
rAlgorithm, const lang::
if (!collator) {
UErrorCode status = U_ZERO_ERROR;
OUString rule = LocaleData().getCollatorRuleByAlgorithm(rLocale,
rAlgorithm);
-if (rule.getLength() 0) {
+if (!rule.isEmpty()) {
collator = new RuleBasedCollator(reinterpret_castconst UChar
*(rule.getStr()), status); // UChar != sal_Unicode in MinGW
if (!
[Libreoffice-commits] .: linguistic/source
linguistic/source/dicimp.cxx | 10 +-
linguistic/source/dlistimp.cxx|2 +-
linguistic/source/gciterator.cxx |8
linguistic/source/hyphdsp.cxx |2 +-
linguistic/source/lngprophelp.cxx |4 ++--
linguistic/source/lngsvcmgr.cxx | 24
linguistic/source/misc.cxx|4 ++--
linguistic/source/misc2.cxx |6 +++---
linguistic/source/spelldsp.cxx| 12 ++--
linguistic/source/spelldta.cxx|2 +-
linguistic/source/thesdsp.cxx |2 +-
11 files changed, 38 insertions(+), 38 deletions(-)
New commits:
commit c3fc5c9c9b17cef63fa7c77a39a0971c27a004f9
Author: Olivier Hallot olivier.hal...@alta.org.br
Date: Tue Dec 27 11:08:04 2011 -0200
Fix for fdo43460 Part XXIII getLength() to isEmpty()
Part XXIII
Modules
linguistic
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 1af7d36..0a09ad5 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -230,7 +230,7 @@ DictionaryNeo::DictionaryNeo(const OUString rName,
bIsModified = bIsActive = sal_False;
bIsReadonly = !bWriteable;
-if( rMainURL.getLength() 0 )
+if( !rMainURL.isEmpty())
{
sal_Bool bExists = FileExists( rMainURL );
if( !bExists )
@@ -271,7 +271,7 @@ sal_uLong DictionaryNeo::loadEntries(const OUString
rMainURL)
// function should only be called once in order to load entries from file
bNeedEntries = sal_False;
-if (rMainURL.getLength() == 0)
+if (rMainURL.isEmpty())
return 0;
uno::Reference lang::XMultiServiceFactory xServiceFactory(
comphelper::getProcessServiceFactory() );
@@ -411,7 +411,7 @@ sal_uLong DictionaryNeo::saveEntries(const OUString rURL)
{
MutexGuard aGuard( GetLinguMutex() );
-if (rURL.getLength() == 0)
+if (rURL.isEmpty())
return 0;
DBG_ASSERT(!INetURLObject( rURL ).HasError(), lng : invalid URL);
@@ -999,7 +999,7 @@ sal_Bool SAL_CALL DictionaryNeo::hasLocation()
throw(RuntimeException)
{
MutexGuard aGuard( GetLinguMutex() );
-return aMainURL.getLength() 0;
+return !aMainURL.isEmpty();
}
OUString SAL_CALL DictionaryNeo::getLocation()
@@ -1075,7 +1075,7 @@ void SAL_CALL DictionaryNeo::storeToURL(
DicEntry::DicEntry(const OUString rDicFileWord,
sal_Bool bIsNegativWord)
{
-if (rDicFileWord.getLength())
+if (!rDicFileWord.isEmpty())
splitDicFileWord( rDicFileWord, aDicWord, aReplacement );
bIsNegativ = bIsNegativWord;
}
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx
index ac4f143..e824888 100644
--- a/linguistic/source/dlistimp.cxx
+++ b/linguistic/source/dlistimp.cxx
@@ -698,7 +698,7 @@ void DicList::_CreateDicList()
sal_Int32 nLen = aActiveDics.getLength();
for (sal_Int32 i = 0; i nLen; ++i)
{
-if (pActiveDic[i].getLength())
+if (!pActiveDic[i].isEmpty())
{
uno::Reference XDictionary xDic( getDictionaryByName(
pActiveDic[i] ) );
if (xDic.is())
diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 1f6ef14..bdd6ee3 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -552,7 +552,7 @@ void GrammarCheckingIterator::DequeueAndCheck()
sal_Int32 nStartPos = aFPEntryItem.m_nStartIndex;
sal_Int32 nSuggestedEnd = GetSuggestedEndOfSentence(
aCurTxt, nStartPos, aCurLocale );
-DBG_ASSERT( (nSuggestedEnd == 0 aCurTxt.getLength() ==
0) || nSuggestedEnd nStartPos,
+DBG_ASSERT( (nSuggestedEnd == 0 aCurTxt.isEmpty()) ||
nSuggestedEnd nStartPos,
nSuggestedEndOfSentencePos calculation failed? );
linguistic2::ProofreadingResult aRes;
@@ -824,7 +824,7 @@ throw (uno::RuntimeException)
{
// check in document is checked automatically in the background...
OUString aDocId = aIt-second;
-if (m_aCurCheckedDocId.getLength() 0 m_aCurCheckedDocId ==
aDocId)
+if (!m_aCurCheckedDocId.isEmpty() m_aCurCheckedDocId == aDocId)
{
// an entry for that document was dequed and is currently
being checked.
bRes = sal_True;
@@ -1099,7 +1099,7 @@ void GrammarCheckingIterator::SetServiceList(
if (nLanguage != LANGUAGE_NONE nLanguage != LANGUAGE_DONTKNOW)
{
-if (aImplName.getLength() 0)
+if (!aImplName.isEmpty())
m_aGCImplNamesByLang[ nLanguage ] = aImplName;
else
m_aGCImplNamesByLang.erase( nLanguage );
@@ -1120,7 +1120,7 @@ uno::Sequence OUString
GrammarCheckingIterator::GetServiceList(
if (aIt != m_aGCImplNamesByLang.end())
aImplName = aIt-second;
-if (aImplName.getLength() 0)
+if (!aImplName.isEmpty())
[Libreoffice-commits] .: 2 commits - sw/source
sw/source/ui/dochdl/gloshdl.cxx |8 +-
sw/source/ui/inc/glosbib.hxx| 11 ++--
sw/source/ui/inc/glosdoc.hxx|6 +-
sw/source/ui/misc/glosbib.cxx | 107 +---
sw/source/ui/misc/glosdoc.cxx | 66 +---
sw/source/ui/misc/glossary.cxx |5 -
sw/source/ui/utlui/gloslst.cxx | 10 +--
7 files changed, 90 insertions(+), 123 deletions(-)
New commits:
commit a9b3b64a5a94a4c27ac524ac6997ef2e2467267c
Author: Brad Sowden c...@sowden.org
Date: Tue Dec 27 23:18:50 2011 +1300
fdo#38831 Convert some SvStrings to std::vector (part 2)
diff --git a/sw/source/ui/dochdl/gloshdl.cxx b/sw/source/ui/dochdl/gloshdl.cxx
index efd545f..2fa3c32 100644
--- a/sw/source/ui/dochdl/gloshdl.cxx
+++ b/sw/source/ui/dochdl/gloshdl.cxx
@@ -38,8 +38,6 @@
#include svl/macitem.hxx
#include sfx2/fcontnr.hxx
#include sfx2/docfile.hxx
-#define _SVSTDARR_STRINGS
-#include svl/svstdarr.hxx
#include svl/urihelper.hxx
#include unotools/transliterationwrapper.hxx
#include poolfmt.hxx
@@ -138,13 +136,13 @@ void SwGlossaryHdl::SetCurGroup(const String rGrp,
sal_Bool bApi, sal_Bool bAlw
String sCurBase = aTemp.getBase();
aTemp.removeSegment();
const String sCurEntryPath =
aTemp.GetMainURL(INetURLObject::NO_DECODE);
-const SvStrings* pPathArr = rStatGlossaries.GetPathArray();
+const std::vectorString* *pPathArr =
rStatGlossaries.GetPathArray();
sal_uInt16 nCurrentPath = USHRT_MAX;
-for(sal_uInt16 nPath = 0; nPath pPathArr-Count(); nPath++)
+for( size_t nPath = 0; nPath pPathArr-size(); nPath++ )
{
if(sCurEntryPath == *(*pPathArr)[nPath])
{
-nCurrentPath = nPath;
+nCurrentPath = static_castsal_uInt16(nPath);
break;
}
}
diff --git a/sw/source/ui/inc/glosbib.hxx b/sw/source/ui/inc/glosbib.hxx
index a7f9c49..83c2706 100644
--- a/sw/source/ui/inc/glosbib.hxx
+++ b/sw/source/ui/inc/glosbib.hxx
@@ -41,7 +41,6 @@
#include vector
class SwGlossaryHdl;
-class SvStrings;
class FEdit : public Edit
{
@@ -104,7 +103,7 @@ protected:
public:
SwGlossaryGroupDlg(Window * pParent,
-const SvStrings* pPathArr,
+const std::vectorString* *pPathArr,
SwGlossaryHdl *pGlosHdl);
~SwGlossaryGroupDlg();
diff --git a/sw/source/ui/inc/glosdoc.hxx b/sw/source/ui/inc/glosdoc.hxx
index b85e6fa..a0db0b8 100644
--- a/sw/source/ui/inc/glosdoc.hxx
+++ b/sw/source/ui/inc/glosdoc.hxx
@@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwGlossaries
String m_aPath;
String m_sOldErrPath;
String m_sErrPath;
-SvStrings *m_pPathArr;
+std::vectorString*m_aPathArr;
SvStrings *m_pGlosArr;
sal_Boolm_bError;
@@ -141,8 +141,8 @@ public:
voidSaveGroupDoc(const String rGrpName, const String
rLongName );
voidUpdateGlosPath(sal_Bool bFull);
voidShowError();
-inline sal_uLongIsGlosPathErr() { return m_bError; }
-const SvStrings*GetPathArray() const {return m_pPathArr;}
+inline sal_uLongIsGlosPathErr() { return m_bError; }
+const std::vectorString** GetPathArray() const { return m_aPathArr; }
};
diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx
index 18f10d2..fff2a2c 100644
--- a/sw/source/ui/misc/glosbib.cxx
+++ b/sw/source/ui/misc/glosbib.cxx
@@ -30,7 +30,6 @@
#undef SW_DLLIMPLEMENTATION
#endif
-#define _SVSTDARR_STRINGS
#include tools/urlobj.hxx
#include tools/stream.hxx
#include vcl/msgbox.hxx
@@ -59,7 +58,7 @@
#define RENAME_TOKEN_DELIM (sal_Unicode)1
SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
-const SvStrings* pPathArr,
+const std::vectorString* *pPathArr,
SwGlossaryHdl *pHdl) :
SvxStandardDialog(pParent, SW_RES(DLG_BIB_BASE)),
aBibFT( this, SW_RES(FT_BIB)),
@@ -81,8 +80,6 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
pRenamedArr(0),
pGlosHdl(pHdl)
{
-sal_uInt16 i;
-
FreeResource();
long nTabs[] =
@@ -100,7 +97,8 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
aNameED.SetModifyHdl(LINK(this, SwGlossaryGroupDlg, ModifyHdl));
aPathLB.SetSelectHdl(LINK(this, SwGlossaryGroupDlg, ModifyHdl));
aRenamePB.SetClickHdl(LINK(this, SwGlossaryGroupDlg, RenameHdl));
-for( i = 0; i pPathArr-Count(); i++)
+
+for( size_t i = 0; i pPathArr-size(); i++ )
{
String sPath(*(*pPathArr)[i]);
INetURLObject aTempURL(sPath);
@@ -119,7 +117,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent,
aPathLB.Enable(sal_True);
const sal_uInt16
[Libreoffice-commits] .: 2 commits - sw/inc sw/source
sw/inc/crsrsh.hxx |1
sw/inc/viewsh.hxx | 21 +++-
sw/source/core/crsr/crsrsh.cxx |8 -
sw/source/core/inc/pagefrm.hxx |5 -
sw/source/core/layout/pagechg.cxx | 22 -
sw/source/core/layout/paintfrm.cxx | 47 ++
sw/source/core/view/viewsh.cxx | 21 +++-
sw/source/core/view/vnew.cxx|9 +-
sw/source/ui/docvw/FrameControlsManager.cxx |9 +-
sw/source/ui/docvw/HeaderFooterWin.cxx | 19 +++-
sw/source/ui/docvw/PageBreakWin.cxx | 19 +++-
sw/source/ui/docvw/edtwin.cxx | 121 ++--
sw/source/ui/inc/FrameControl.hxx |4
sw/source/ui/inc/FrameControlsManager.hxx | 11 --
sw/source/ui/inc/HeaderFooterWin.hxx|3
sw/source/ui/inc/PageBreakWin.hxx |3
sw/source/ui/inc/edtwin.hxx | 14 +--
sw/source/ui/inc/wrtsh.hxx |2
sw/source/ui/wrtsh/wrtsh1.cxx |6 -
19 files changed, 211 insertions(+), 134 deletions(-)
New commits:
commit cce76e658af88813e17dea4f04388a29d7e582df
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Dec 29 13:42:43 2011 +0100
Header/Footer: When editing, show only the appropriate conrol.
Instead of showing both the header and footer controls, show only the
footer-related if in footer, or header-related if in header.
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index fd4a3d6..85b17a4 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -92,6 +92,12 @@ namespace vcl
class OldStylePrintAdaptor;
}
+enum FrameControlType
+{
+PageBreak,
+Header,
+Footer
+};
// Define for flags needed in ctor or layers below.
// Currently the PreView flag is needed for DrawPage.
@@ -156,9 +162,10 @@ class SW_DLLPUBLIC ViewShell : public Ring
sal_Bool bEnableSmooth:1; // Disable SmoothScroll, e.g. for drag
// of scrollbars.
sal_Bool bEndActionByVirDev:1; // Paints from EndAction always via
virtual device
-bool bShowHeaderFooterSeparator:1;
-bool bHeaderFooterEdit:1;
// (e.g. when browsing).
+bool bShowHeaderSeparator:1; // Flag to say that we are showing the
header control
+bool bShowFooterSeparator:1; // Flag to say that we are showing the
footer control
+bool bHeaderFooterEdit:1; // Flag to say that we are editing header
or footer (according to the bShow(Header|Footer)Separator above)
// boolean, indicating that class in in constructor.
bool mbInConstructor:1;
@@ -565,10 +572,12 @@ public:
const SwPostItMgr* GetPostItMgr() const { return
(const_castViewShell*(this))-GetPostItMgr(); }
SwPostItMgr* GetPostItMgr();
-void ToggleHeaderFooterEdit( );
+/// Acts both for headers / footers, depending on the
bShow(Header|Footer)Separator flags
+void ToggleHeaderFooterEdit();
+/// Acts both for headers / footers, depending on the
bShow(Header|Footer)Separator flags
bool IsHeaderFooterEdit() const { return bHeaderFooterEdit; }
-bool IsShowHeaderFooterSeparator() { return bShowHeaderFooterSeparator; }
-virtual void SetShowHeaderFooterSeparator( bool bShow ) {
bShowHeaderFooterSeparator = bShow; }
+bool IsShowHeaderFooterSeparator( FrameControlType eControl ) { return
(eControl == Header)? bShowHeaderSeparator: bShowFooterSeparator; }
+virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool
bShow ) { if ( eControl == Header ) bShowHeaderSeparator = bShow; else
bShowFooterSeparator = bShow; }
};
// class CurrShell manages global ShellPointer ---
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index bb55f6b..0d1efa3 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1316,7 +1316,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool
bIdleEnd )
}
if ( IsInHeaderFooter() != IsHeaderFooterEdit() )
-ToggleHeaderFooterEdit( );
+ToggleHeaderFooterEdit();
// #i27301#
SwNotifyAccAboutInvalidTextSelections aInvalidateTextSelections( *this );
diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx
index 1e16a98..779c4cd 100644
--- a/sw/source/core/inc/pagefrm.hxx
+++ b/sw/source/core/inc/pagefrm.hxx
@@ -28,7 +28,7 @@
#ifndef _PAGEFRM_HXX
#define _PAGEFRM_HXX
-
+#include viewsh.hxx
#include svl/svarray.hxx
#include ftnboss.hxx
@@ -359,7 +359,8 @@ public:
// in case this is am empty page, this function returns the 'reference'
page
const SwPageFrm GetFormatPage() const;
-bool IsOverHeaderFooterArea( const Point rPt ) const;
+/// If in header or footer area, it also indicates the exact area in
rControl.
+bool IsOverHeaderFooterArea( const Point rPt, FrameControlType
[Libreoffice-commits] .: default_images/cmd default_images/fpicker default_images/sw fpicker/source icon-themes/hicontrast icon-themes/oxygen svtools/source
dev/null|binary
fpicker/source/office/iodlg.hrc | 12 +---
fpicker/source/office/iodlg.src | 16
svtools/source/inc/iodlg.hrc| 12 +---
4 files changed, 10 insertions(+), 30 deletions(-)
New commits:
commit e220f41cb2486d2ad101d98e48fbbc40c9fd08c3
Author: Gustavo Buzzatti Pacheco gbpach...@gmail.com
Date: Thu Dec 29 20:13:55 2011 +0100
EasyHack fdo#42454, remove code associated with unused icons
diff --git a/default_images/cmd/lc_splitparentvertical.png
b/default_images/cmd/lc_splitparentvertical.png
deleted file mode 100644
index a36adb4..000
Binary files a/default_images/cmd/lc_splitparentvertical.png and /dev/null
differ
diff --git a/default_images/fpicker/res/list.png
b/default_images/fpicker/res/list.png
deleted file mode 100644
index 2438714..000
Binary files a/default_images/fpicker/res/list.png and /dev/null differ
diff --git a/default_images/sw/res/anchor.png b/default_images/sw/res/anchor.png
deleted file mode 100644
index eba7b9c..000
Binary files a/default_images/sw/res/anchor.png and /dev/null differ
diff --git a/default_images/sw/res/danchor.png
b/default_images/sw/res/danchor.png
deleted file mode 100644
index eba7b9c..000
Binary files a/default_images/sw/res/danchor.png and /dev/null differ
diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc
index 42b235e..353314e 100644
--- a/fpicker/source/office/iodlg.hrc
+++ b/fpicker/source/office/iodlg.hrc
@@ -35,13 +35,11 @@
#define FT_EXPLORERFILE_CURRENTPATH 10
#define BTN_EXPLORERFILE_NEWFOLDER 11
-#define BTN_EXPLORERFILE_LISTVIEW 12
-#define BTN_EXPLORERFILE_DETAILSVIEW13
-#define BTN_EXPLORERFILE_UP 14
-#define BTN_EXPLORERFILE_STANDARD 15
-#define BTN_EXPLORERFILE_OPEN 16
-#define BTN_EXPLORERFILE_CANCEL 17
-#define BTN_EXPLORERFILE_HELP 18
+#define BTN_EXPLORERFILE_UP 12
+#define BTN_EXPLORERFILE_STANDARD 13
+#define BTN_EXPLORERFILE_OPEN 14
+#define BTN_EXPLORERFILE_CANCEL 15
+#define BTN_EXPLORERFILE_HELP 16
#define IMG_FILEDLG_BTN_UP 10
#define IMG_FILEDLG_BTN_STD 11
diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src
index da11eb5..b30bf7e 100644
--- a/fpicker/source/office/iodlg.src
+++ b/fpicker/source/office/iodlg.src
@@ -77,22 +77,6 @@ ModalDialog DLG_SVT_EXPLORERFILE
Pos = MAP_APPFONT ( 59 , 6 ) ;
QuickHelpText [ en-US ] = Create New Directory ;
};
-ImageButton BTN_EXPLORERFILE_LISTVIEW
-{
-HelpID =
fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_LISTVIEW;
-TabStop = FALSE ;
-Pos = MAP_APPFONT ( 109 , 6 ) ;
-ButtonImage = Image
-{
-ImageBitmap = Bitmap
-{
-File = list.bmp ;
-};
-MASKCOLOR
-};
-QuickHelpText [ en-US ] = List;
-};
-HelpID =
fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_DETAILSVIEW;
MenuButton BTN_EXPLORERFILE_UP
{
HelpID = fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP;
diff --git a/icon-themes/hicontrast/cmd/lc_splitparentvertical.png
b/icon-themes/hicontrast/cmd/lc_splitparentvertical.png
deleted file mode 100644
index a36adb4..000
Binary files a/icon-themes/hicontrast/cmd/lc_splitparentvertical.png and
/dev/null differ
diff --git a/icon-themes/hicontrast/cmd/sc_splitparentvertical.png
b/icon-themes/hicontrast/cmd/sc_splitparentvertical.png
deleted file mode 100644
index 82c928b..000
Binary files a/icon-themes/hicontrast/cmd/sc_splitparentvertical.png and
/dev/null differ
diff --git a/icon-themes/oxygen/cmd/lch_splitparentvertical.png
b/icon-themes/oxygen/cmd/lch_splitparentvertical.png
deleted file mode 100644
index aee93b9..000
Binary files a/icon-themes/oxygen/cmd/lch_splitparentvertical.png and /dev/null
differ
diff --git a/icon-themes/oxygen/cmd/sch_splitparentvertical.png
b/icon-themes/oxygen/cmd/sch_splitparentvertical.png
deleted file mode 100644
index 444b77f..000
Binary files a/icon-themes/oxygen/cmd/sch_splitparentvertical.png and /dev/null
differ
diff --git a/icon-themes/oxygen/res/lxh03241.png
b/icon-themes/oxygen/res/lxh03241.png
deleted file mode 100644
index 33776d7..000
Binary files a/icon-themes/oxygen/res/lxh03241.png and /dev/null differ
diff --git a/icon-themes/oxygen/res/sxh03241.png
b/icon-themes/oxygen/res/sxh03241.png
deleted file mode 100644
index 444b77f..000
Binary files a/icon-themes/oxygen/res/sxh03241.png and /dev/null differ
diff --git a/svtools/source/inc/iodlg.hrc b/svtools/source/inc/iodlg.hrc
index b94d0df..a3ea385 100644
--- a/svtools/source/inc/iodlg.hrc
+++ b/svtools/source/inc/iodlg.hrc
@@ -34,13 +34,11 @@
#define FT_EXPLORERFILE_CURRENTPATH 10
#define
[Libreoffice-commits] .: sw/source vcl/source
sw/source/ui/index/cnttab.src |2 +-
vcl/source/window/tabdlg.cxx |7 +++
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit f29c4dca4a451d28d5fef06c966725636e542eeb
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Dec 27 15:41:22 2011 +0100
Thanks to Ivan Timofeev, fix the 'Preview' checkbox in 'Indexes and
Tables...'
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 71f034d..c2ce533 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -106,7 +106,7 @@ TabDialog DLG_MULTI_TOX
};
CheckBox CB_SHOWEXAMPLE
{
-Size = MAP_APPFONT ( 200, 10 ) ;
+Size = MAP_APPFONT ( 45, 10 ) ;
Text [ en-US ] = Preview;
};
Text [ en-US ] = Insert Index/Table;
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index ba67ed1..7c68367 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -61,12 +61,11 @@ void TabDialog::ImplPosControls()
pTabControl = (TabControl*)pChild;
else if ( pTabControl )
{
-long nTxtWidth = pChild-GetCtrlTextWidth( pChild-GetText() );
-nTxtWidth += IMPL_EXTRA_BUTTON_WIDTH;
+Size aOptimalSize( pChild-GetOptimalSize(
WINDOWSIZE_PREFERRED ) );
+long nTxtWidth = aOptimalSize.Width();
if ( nTxtWidth aCtrlSize.Width() )
aCtrlSize.Width() = nTxtWidth;
-long nTxtHeight = pChild-GetTextHeight();
-nTxtHeight += IMPL_EXTRA_BUTTON_HEIGHT;
+long nTxtHeight = aOptimalSize.Height();
if ( nTxtHeight aCtrlSize.Height() )
aCtrlSize.Height() = nTxtHeight;
nDownCtrl++;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source
sw/source/ui/index/cnttab.src |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 02870470f069120dc0e65b2cdfef5fd2c426e1e9
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Dec 27 13:19:42 2011 +0100
Fix position of the 'evaluate up to level' text and numeric field.
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 821a2c7..71f034d 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -196,14 +196,14 @@ TabPage TP_TOX_SELECT
};
FixedText FT_LEVEL
{
-Pos = MAP_APPFONT ( 130 , 70 ) ;
-Size = MAP_APPFONT ( 60 , 8 ) ;
+Pos = MAP_APPFONT ( 130 , 72 ) ;
+Size = MAP_APPFONT ( 95 , 8 ) ;
Text [ en-US ] = Evaluate up to level;
};
NumericFieldNF_LEVEL
{
HelpID = sw:NumericField:TP_TOX_SELECT:NF_LEVEL;
-Pos = MAP_APPFONT ( 231 , 72 ) ;
+Pos = MAP_APPFONT ( 231 , 70 ) ;
Size = MAP_APPFONT ( 20 , 12 ) ;
Border = TRUE ;
TabStop = TRUE ;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4-5' - svx/source
svx/source/fmcomp/gridctrl.src |2 +- svx/source/form/fmexpl.src |2 +- svx/source/form/formshell.src |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) New commits: commit 2263eb7178f7645a600a68ed04847346771355cf Author: David Tardon dtar...@redhat.com Date: Thu Dec 22 13:30:41 2011 +0100 we need to include the localized file This reverts commit 9d88c67c4cfa8e894d23ebe7924a9d630327ccda. Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Andras Timar tima...@gmail.com Signed-off-by: Jan Holesovsky ke...@suse.cz diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src index b29af06..611df77 100644 --- a/svx/source/fmcomp/gridctrl.src +++ b/svx/source/fmcomp/gridctrl.src @@ -27,7 +27,7 @@ #include svx/fmresids.hrc #include svx/svxids.hrc -#include globlmn_tmpl.hrc +#include globlmn.hrc #include fmhelp.hrc #include svx/svxcommands.h diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index c6509d8..f4d56d3 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -28,7 +28,7 @@ #include svx/svxids.hrc #include svx/fmresids.hrc #include fmexpl.hrc -#include globlmn_tmpl.hrc +#include globlmn.hrc #include svx/svxcommands.h #include fmhelp.hrc diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src index 369de22..5b9312a 100644 --- a/svx/source/form/formshell.src +++ b/svx/source/form/formshell.src @@ -29,7 +29,7 @@ #include svx/svxids.hrc #include svx/dialogs.hrc #include sfx2/sfxsids.hrc -#include globlmn_tmpl.hrc +#include globlmn.hrc #include helpid.hrc #include fmhelp.hrc ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source vcl/source
sw/source/ui/index/cnttab.src |2 +-
vcl/source/window/tabdlg.cxx |7 +++
2 files changed, 4 insertions(+), 5 deletions(-)
New commits:
commit 114b4806e9233140fc42cba0b174a8f21e323a79
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Dec 27 15:41:22 2011 +0100
Thanks to Ivan Timofeev, fix the 'Preview' checkbox in 'Indexes and
Tables...'
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 71f034d..c2ce533 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -106,7 +106,7 @@ TabDialog DLG_MULTI_TOX
};
CheckBox CB_SHOWEXAMPLE
{
-Size = MAP_APPFONT ( 200, 10 ) ;
+Size = MAP_APPFONT ( 45, 10 ) ;
Text [ en-US ] = Preview;
};
Text [ en-US ] = Insert Index/Table;
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index eaf4a14..9313211 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -61,12 +61,11 @@ void TabDialog::ImplPosControls()
pTabControl = (TabControl*)pChild;
else if ( pTabControl )
{
-long nTxtWidth = pChild-GetCtrlTextWidth( pChild-GetText() );
-nTxtWidth += IMPL_EXTRA_BUTTON_WIDTH;
+Size aOptimalSize( pChild-GetOptimalSize(
WINDOWSIZE_PREFERRED ) );
+long nTxtWidth = aOptimalSize.Width();
if ( nTxtWidth aCtrlSize.Width() )
aCtrlSize.Width() = nTxtWidth;
-long nTxtHeight = pChild-GetTextHeight();
-nTxtHeight += IMPL_EXTRA_BUTTON_HEIGHT;
+long nTxtHeight = aOptimalSize.Height();
if ( nTxtHeight aCtrlSize.Height() )
aCtrlSize.Height() = nTxtHeight;
nDownCtrl++;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - default_images/sw ooo_custom_images/hicontrast ooo_custom_images/human ooo_custom_images/tango sw/source vcl/source
default_images/sw/res/image-example.png |binary
dev/null |binary
ooo_custom_images/hicontrast/sw/res/image-example.png |binary
ooo_custom_images/human/sw/res/image-example.png |binary
ooo_custom_images/tango/sw/res/image-example.png |binary
sw/source/ui/frmdlg/frmpage.cxx | 18 ++
sw/source/ui/frmdlg/frmpage.src |2 +-
vcl/source/gdi/outdev2.cxx|2 +-
8 files changed, 16 insertions(+), 6 deletions(-)
New commits:
commit c60740a010cad96dd6a77ade90d8c1ed013b30fd
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Dec 27 22:25:36 2011 +0100
Fix drawing of the either horizontally, or vertically mirrored bitmaps.
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index d405367..d8d847e 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -1821,7 +1821,7 @@ Bitmap OutputDevice::ImplBlend( Bitmap aBmp,
aTR.mnDestWidth = aOutSz.Width();
aTR.mnDestHeight= aOutSz.Height();
-if( !bHMirr || !bVMirr )
+if( !bHMirr !bVMirr )
bFastBlend = ImplFastBitmapBlending( *pB,*pP,*pA, aTR );
}
commit 6095326517e05513085f379055e86b5d3c0270fd
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Mon Dec 19 12:37:59 2011 +0100
Try to draw replacement preview at original size
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 288141b..de3c4df 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -224,7 +224,7 @@ static FrmMap aHFlyHtmlMap[] =
{SwFPos::FROMLEFT, SwFPos::MIR_FROMLEFT,
text::HoriOrientation::NONE, LB_FLY_REL_PG_FRAME}
};
-// own vertical alignment map for to frame anchored objects
+// own vertical alignment map for objects anchored to frame
#define VERT_FRAME_REL (LB_FLY_VERT_FRAME|LB_FLY_VERT_PRTAREA)
static FrmMap aVFrameMap[] =
@@ -1941,7 +1941,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB )
}
/*
-Description:horizonal Pos
+Description:horizontal Pos
*/
IMPL_LINK( SwFrmPage, RelHdl, ListBox *, pLB )
{
@@ -2555,14 +2555,24 @@ void BmpWindow::Paint( const Rectangle )
aGrfSize = ::GetGraphicSizeTwip(aGraphic, this);
//it should show the default bitmap also if no graphic can be found
if(!aGrfSize.Width() !aGrfSize.Height())
-aGrfSize = PixelToLogic(aBmp.GetSizePixel());
+aGrfSize = PixelToLogic(aBmp.GetSizePixel());
long nRelGrf = aGrfSize.Width() * 100L / aGrfSize.Height();
long nRelWin = aPntSz.Width() * 100L / aPntSz.Height();
if(nRelGrf nRelWin)
{
const long nWidth = aPntSz.Width();
-aPntSz.Width() = aPntSz.Height() * nRelGrf /100;
+// if we use a replacement preview, try to draw at original size
+if ( !bGraphic ( aGrfSize.Width() = aPntSz.Width() ) (
aGrfSize.Height() = aPntSz.Height() ) )
+{
+const long nHeight = aPntSz.Height();
+aPntSz.Width() = aGrfSize.Width();
+aPntSz.Height() = aGrfSize.Height();
+aPntPos.Y() += (nHeight - aPntSz.Height()) / 2;
+}
+else
+aPntSz.Width() = aPntSz.Height() * nRelGrf /100;
+
if(!bLeftAlign)
aPntPos.X() += nWidth - aPntSz.Width() ;
}
commit d9f06dd910c64385fbc386c392b089d1fa6e9351
Author: Stefan Knorr (astron) heinzless...@gmail.com
Date: Sat Dec 17 18:51:17 2011 +0100
Remove the dog
diff --git a/default_images/sw/res/dog.png b/default_images/sw/res/dog.png
deleted file mode 100644
index f0d7347..000
Binary files a/default_images/sw/res/dog.png and /dev/null differ
diff --git a/default_images/sw/res/image-example.png
b/default_images/sw/res/image-example.png
new file mode 100644
index 000..766ba0d
Binary files /dev/null and b/default_images/sw/res/image-example.png differ
diff --git a/ooo_custom_images/hicontrast/sw/res/dog.png
b/ooo_custom_images/hicontrast/sw/res/dog.png
deleted file mode 100644
index a6aaed8..000
Binary files a/ooo_custom_images/hicontrast/sw/res/dog.png and /dev/null differ
diff --git a/ooo_custom_images/hicontrast/sw/res/image-example.png
b/ooo_custom_images/hicontrast/sw/res/image-example.png
new file mode 100644
index 000..0071c40
Binary files /dev/null and
b/ooo_custom_images/hicontrast/sw/res/image-example.png differ
diff --git a/ooo_custom_images/human/sw/res/dog.png
b/ooo_custom_images/human/sw/res/dog.png
deleted file mode 100644
index 3b9c02f..000
Binary files a/ooo_custom_images/human/sw/res/dog.png and /dev/null differ
diff --git a/ooo_custom_images/human/sw/res/image-example.png
b/ooo_custom_images/human/sw/res/image-example.png
new file
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source vcl/inc
sw/source/ui/docvw/PageBreakWin.cxx | 77 +---
sw/source/ui/inc/PageBreakWin.hxx |2
vcl/inc/vcl/menubtn.hxx |3 -
3 files changed, 50 insertions(+), 32 deletions(-)
New commits:
commit e095be2fd4a54d7cd876a6d2f86363a99ddb5ed8
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Dec 22 11:59:36 2011 +0100
Improve usability of the Page Break control.
- use the same fade in/out values that we use for headers/footers
- clicking on the line opens the menu too
- clicking outside the menu hides the button
- leaving the line or the button hides the button immediately
diff --git a/sw/source/ui/docvw/PageBreakWin.cxx
b/sw/source/ui/docvw/PageBreakWin.cxx
index 9279c00..7c1f00e 100644
--- a/sw/source/ui/docvw/PageBreakWin.cxx
+++ b/sw/source/ui/docvw/PageBreakWin.cxx
@@ -68,7 +68,7 @@ using namespace drawinglayer::primitive2d;
namespace
{
-B2DPolygon lcl_CreatePolygon( B2DRectangle aBounds, bool bMirror )
+static B2DPolygon lcl_CreatePolygon( B2DRectangle aBounds, bool bMirror )
{
B2DPolygon aRetval;
const double nRadius = 1;
@@ -164,17 +164,33 @@ namespace
SwDashedLine( pParent, rColor ),
m_pWin( pWin ) {};
-
virtual void MouseMove( const MouseEvent rMEvt );
+virtual void MouseButtonDown( const MouseEvent rMEvt );
};
void SwBreakDashedLine::MouseMove( const MouseEvent rMEvt )
{
if ( rMEvt.IsLeaveWindow() )
-m_pWin-Fade( false );
+{
+// don't fade if we just move to the 'button'
+Rectangle aRect( m_pWin-GetPosPixel(), m_pWin-GetSizePixel() );
+Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !aRect.IsInside( aEventPos ) )
+m_pWin-Fade( false );
+}
else if ( !m_pWin-IsVisible() )
m_pWin-Fade( true );
}
+
+void SwBreakDashedLine::MouseButtonDown( const MouseEvent rMEvt )
+{
+sal_uInt16 nItemId = m_pWin-GetPopupMenu()-Execute( this,
rMEvt.GetPosPixel() );
+if ( nItemId )
+{
+m_pWin-SetCurItemId( nItemId );
+m_pWin-Select();
+}
+}
}
SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const SwPageFrm* pPageFrm
) :
@@ -195,9 +211,10 @@ SwPageBreakWin::SwPageBreakWin( SwEditWin* pEditWin, const
SwPageFrm* pPageFrm )
// Create the popup menu
m_pPopupMenu = new PopupMenu( SW_RES( MN_PAGEBREAK_BUTTON ) );
+m_pPopupMenu-SetDeactivateHdl( LINK( this, SwPageBreakWin, HideHandler )
);
SetPopupMenu( m_pPopupMenu );
-m_aFadeTimer.SetTimeout( 500 );
+m_aFadeTimer.SetTimeout( 50 );
m_aFadeTimer.SetTimeoutHdl( LINK( this, SwPageBreakWin, FadeHandler ) );
}
@@ -383,7 +400,13 @@ void SwPageBreakWin::Select( )
void SwPageBreakWin::MouseMove( const MouseEvent rMEvt )
{
if ( rMEvt.IsLeaveWindow() )
-Fade( false );
+{
+// don't fade if we just move to the 'line', or the popup menu is open
+Rectangle aRect( m_pLine-GetPosPixel(), m_pLine-GetSizePixel() );
+Point aEventPos( GetPosPixel() + rMEvt.GetPosPixel() );
+if ( !aRect.IsInside( aEventPos ) !PopupMenu::IsInExecute() )
+Fade( false );
+}
else if ( !IsVisible() )
Fade( true );
}
@@ -457,13 +480,13 @@ void SwPageBreakWin::UpdatePosition( )
long nRight = std::min( nPgRight + aBtnSize.getWidth() - ARROW_WIDTH /
2, aVisArea.Right() );
nBtnLeft = nRight - aBtnSize.getWidth();
if ( IsVisible() )
- nLineRight = nBtnLeft - ARROW_WIDTH / 2;
+ nLineRight = nBtnLeft;
}
else
{
nBtnLeft = std::max( nPgLeft - aBtnSize.Width() + ARROW_WIDTH / 2,
aVisArea.Left() );
if ( IsVisible() )
- nLineLeft = nBtnLeft + aBtnSize.Width( ) + ARROW_WIDTH / 2;
+ nLineLeft = nBtnLeft + aBtnSize.Width();
}
// Set the button position
@@ -493,22 +516,26 @@ void SwPageBreakWin::SetReadonly( bool bReadonly )
void SwPageBreakWin::Fade( bool bFadeIn )
{
-if ( !PopupMenu::IsInExecute() )
-{
-m_bIsAppearing = bFadeIn;
-if ( !m_bDestroyed m_aFadeTimer.IsActive( ) )
-m_aFadeTimer.Stop();
-if ( !m_bDestroyed )
-m_aFadeTimer.Start( );
-}
+m_bIsAppearing = bFadeIn;
+if ( !m_bDestroyed m_aFadeTimer.IsActive( ) )
+m_aFadeTimer.Stop();
+if ( !m_bDestroyed )
+m_aFadeTimer.Start( );
+}
+
+IMPL_LINK( SwPageBreakWin, HideHandler, void *, EMPTYARG )
+{
+Fade( false );
+
+return 0;
}
IMPL_LINK( SwPageBreakWin, FadeHandler, Timer *, EMPTYARG )
{
if ( m_bIsAppearing m_nFadeRate 0 )
-m_nFadeRate -= 10;
+m_nFadeRate -= 25;
else if ( !m_bIsAppearing m_nFadeRate 100 )
-m_nFadeRate += 10;
+m_nFadeRate += 25;
if ( m_nFadeRate != 100 !IsVisible
[Libreoffice-commits] .: scp2/source
scp2/source/ooo/ure.scp |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit f31656f18ac39db28aa047a43338457f09804915 Author: Jan Holesovsky ke...@suse.cz Date: Thu Dec 22 14:40:01 2011 +0100 The packaging was missing uno_cppuhelpergcc33.dll on MinGW. diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 09d27aa..58d8ec0 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -192,7 +192,7 @@ File gid_File_Dl_Cppuhelper LIB_FILE_BODY; Dir = SCP2_URE_DL_DIR; #if defined WNT !defined _MSC // Hack for not gbuild'ified cppuhelper on MinGW: -Name = uno_cppuhelpergcc33.dll +Name = uno_cppuhelpergcc33.dll; #else Name = SCP2_URE_DL_UNO_COMID_VER(cppuhelper, 3); #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Writer.xcs|2 +- officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit f47ee3cd6113ff1312ca49b38d733ec293c423c1 Author: Jan Holesovsky ke...@suse.cz Date: Wed Dec 21 18:54:08 2011 +0100 Don't show the non-printing characters by default. diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 10ff191..73645db 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1131,7 +1131,7 @@ descDetermines whether certain settings are applied (display of tab stops, spaces, breaks)/desc labelMeta characters/label /info - valuetrue/value + valuefalse/value /prop prop oor:name=ParagraphEnd oor:type=xs:boolean !-- OldPath: Writer/Contents/Nonprinting_characters -- diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index c5f7b1d..4d6fd70 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -116,7 +116,7 @@ descDetermines whether certain settings are applied or not (display of tab stops, spaces, breaks)./desc labelMeta characters/label /info - valuetrue/value + valuefalse/value /prop prop oor:name=ParagraphEnd oor:type=xs:boolean !-- OldPath: HTML_Editor/Content/Nonprinting_characters -- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: officecfg/registry
officecfg/registry/schema/org/openoffice/Office/Writer.xcs|2 +- officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 40fe511d0ed56d4481cad9c278899f3b9167cdb5 Author: Jan Holesovsky ke...@suse.cz Date: Wed Dec 21 18:54:08 2011 +0100 Don't show the non-printing characters by default. diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs index 10ff191..73645db 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs @@ -1131,7 +1131,7 @@ descDetermines whether certain settings are applied (display of tab stops, spaces, breaks)/desc labelMeta characters/label /info - valuetrue/value + valuefalse/value /prop prop oor:name=ParagraphEnd oor:type=xs:boolean !-- OldPath: Writer/Contents/Nonprinting_characters -- diff --git a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs index c5f7b1d..4d6fd70 100644 --- a/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/WriterWeb.xcs @@ -116,7 +116,7 @@ descDetermines whether certain settings are applied or not (display of tab stops, spaces, breaks)./desc labelMeta characters/label /info - valuetrue/value + valuefalse/value /prop prop oor:name=ParagraphEnd oor:type=xs:boolean !-- OldPath: HTML_Editor/Content/Nonprinting_characters -- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: desktop/scripts
desktop/scripts/soffice.sh.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit a0999b7cd47a9faa1ed7aeef29510674e924f702 Author: Michal Svec ms...@suse.com Date: Wed Dec 14 18:19:09 2011 +0100 Fix the soffice.sh wrapper's -h / --version. diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in index 86ea49f..defd7b2 100755 --- a/desktop/scripts/soffice.sh.in +++ b/desktop/scripts/soffice.sh.in @@ -161,11 +161,11 @@ fi if test $# -eq 1; then case $1 in -h | --h | --he | --hel | --help) -$sd_prog/soffice.bin -h +$sd_prog/soffice.bin --help exit 0 ;; -V | --v | --ve | --ver | --vers | --versi | --versio | --version) -$sd_prog/soffice.bin -h | head -1 +$sd_prog/soffice.bin --version exit 0 ;; *) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - desktop/scripts
desktop/scripts/soffice.sh.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 67482ee4b91fd082333f2d66ced119e6b54c0ee4 Author: Michal Svec ms...@suse.com Date: Wed Dec 14 18:19:09 2011 +0100 Fix the soffice.sh wrapper's -h / --version. diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in index 86ea49f..defd7b2 100755 --- a/desktop/scripts/soffice.sh.in +++ b/desktop/scripts/soffice.sh.in @@ -161,11 +161,11 @@ fi if test $# -eq 1; then case $1 in -h | --h | --he | --hel | --help) -$sd_prog/soffice.bin -h +$sd_prog/soffice.bin --help exit 0 ;; -V | --v | --ve | --ver | --vers | --versi | --versio | --version) -$sd_prog/soffice.bin -h | head -1 +$sd_prog/soffice.bin --version exit 0 ;; *) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/unx
vcl/unx/generic/window/salframe.cxx |2 ++ vcl/unx/gtk/window/gtkframe.cxx |2 ++ 2 files changed, 4 insertions(+) New commits: commit 0d5fde790b19515378c9b11a928603b76ac0b846 Author: Jan Holesovsky ke...@suse.cz Date: Wed Dec 14 19:01:44 2011 +0100 If possible, make the window big enough to fit all Writer toolbars. [with large icons] diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index b835a01..20b8b06 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -345,6 +345,8 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, int nScreen, SystemParentData* w = 785; if( aScreenSize.Width() = 1024 ) w = 920; +if( aScreenSize.Width() = 1280 ) +w = 1050; if( aScreenSize.Height() = 600 ) h = 550; diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index 0c195d3..a384375 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -1328,6 +1328,8 @@ Size GtkSalFrame::calcDefaultSize() w = 785; if( aScreenSize.Width() = 1024 ) w = 920; +if( aScreenSize.Width() = 1280 ) +w = 1050; if( aScreenSize.Height() = 600 ) h = 550; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/gbuild.mk |2 +-
solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c7052a5d6242df174ba21134635ac3d18530bf34
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Dec 8 23:55:45 2011 +0100
i18npool on Windows needed more fixes.
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..256261c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,7 +311,7 @@ gb_XSLTPROCTARGET :=
gb_XSLTPROC := xsltproc
else
gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $$(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
endif
ifeq ($(SYSTEM_PYTHON),YES)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 809d83c..5f8fb1c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE) $(subst
$(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
endef
-gb_Helper_set_ld_path := PATH=\$${PATH}:$(OUTDIR)/bin\
+gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
# convert parameters filesystem root to native notation
# does some real work only on windows, make sure not to
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - i18npool/source solenv/gbuild
i18npool/source/localedata/Makefile |8 ++--
solenv/gbuild/Helper.mk |2 +-
solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
solenv/gbuild/platform/com_GCC_defs.mk |2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit f7ae3384e2ad7387d839e40ca5c7196e2b597991
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Dec 8 16:43:26 2011 +0100
Fix 18npool build on Windows.
diff --git a/i18npool/source/localedata/Makefile
b/i18npool/source/localedata/Makefile
index 618db65..da83ff4 100755
--- a/i18npool/source/localedata/Makefile
+++ b/i18npool/source/localedata/Makefile
@@ -40,15 +40,11 @@ localedata_%.cxx : localedata_%_invis.cxx
ifeq ($(OS_FOR_BUILD),WNT)
localedata_%_invis.cxx : $(realpath
$(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR)/bin/saxparser$(gb_Executable_EXT)
- $(call gb_Helper_execute,saxparser $* `cygpath -m $` $@ \
- $(my_file)`cygpath -m
$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m
$(OUTDIR)/bin/types.rdb` \
- -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
+ $(call gb_Helper_execute,saxparser $* `cygpath -m $` $@
$(my_file)`cygpath -m
$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m
$(OUTDIR)/bin/types.rdb` -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
else
localedata_%_invis.cxx : $(realpath
$(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build)
- $(call gb_Helper_execute,saxparser $* $ $@ \
-
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb
$(OUTDIR_FOR_BUILD)/bin/types.rdb \
- -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
+ $(call gb_Helper_execute,saxparser $* $ $@
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb
$(OUTDIR_FOR_BUILD)/bin/types.rdb
-env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
endif
saxparser.rdb : saxparser.input
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 881aed9..e27d2ee 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -165,7 +165,7 @@ gb_StaticLibrary_$(1) += $(2)
endef
define gb_Helper_execute
-$(call gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
+$(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
endef
# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker
need to use
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5f8fb1c..809d83c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE) $(subst
$(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
endef
-gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
+gb_Helper_set_ld_path := PATH=\$${PATH}:$(OUTDIR)/bin\
# convert parameters filesystem root to native notation
# does some real work only on windows, make sure not to
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 03ac2a8..c154a7a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -144,7 +144,7 @@ else
gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
endif
-gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib
+gb_Helper_set_ld_path :=
$(gb_Helper_LIBRARY_PATH_VAR)=\$(OUTDIR_FOR_BUILD)/lib\
# $(1): list of directory pathnames to append at the end of the ld path
define gb_Helper_extend_ld_path
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: i18npool/source solenv/gbuild
i18npool/source/localedata/Makefile |8 ++--
solenv/gbuild/Helper.mk |2 +-
solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
solenv/gbuild/platform/com_GCC_defs.mk |2 +-
4 files changed, 5 insertions(+), 9 deletions(-)
New commits:
commit c240dbc820359cf924e2383b743c02e204945a4c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Thu Dec 8 16:43:26 2011 +0100
Fix 18npool build on Windows.
diff --git a/i18npool/source/localedata/Makefile
b/i18npool/source/localedata/Makefile
index 618db65..da83ff4 100755
--- a/i18npool/source/localedata/Makefile
+++ b/i18npool/source/localedata/Makefile
@@ -40,15 +40,11 @@ localedata_%.cxx : localedata_%_invis.cxx
ifeq ($(OS_FOR_BUILD),WNT)
localedata_%_invis.cxx : $(realpath
$(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR)/bin/saxparser$(gb_Executable_EXT)
- $(call gb_Helper_execute,saxparser $* `cygpath -m $` $@ \
- $(my_file)`cygpath -m
$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m
$(OUTDIR)/bin/types.rdb` \
- -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
+ $(call gb_Helper_execute,saxparser $* `cygpath -m $` $@
$(my_file)`cygpath -m
$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m
$(OUTDIR)/bin/types.rdb` -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
else
localedata_%_invis.cxx : $(realpath
$(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build)
- $(call gb_Helper_execute,saxparser $* $ $@ \
-
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb
$(OUTDIR_FOR_BUILD)/bin/types.rdb \
- -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
+ $(call gb_Helper_execute,saxparser $* $ $@
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb
$(OUTDIR_FOR_BUILD)/bin/types.rdb
-env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
endif
saxparser.rdb : saxparser.input
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 881aed9..e27d2ee 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -165,7 +165,7 @@ gb_StaticLibrary_$(1) += $(2)
endef
define gb_Helper_execute
-$(call gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
+$(gb_Helper_set_ld_path) $(OUTDIR_FOR_BUILD)/bin/$(1)
endef
# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker
need to use
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5f8fb1c..809d83c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE) $(subst
$(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
endef
-gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
+gb_Helper_set_ld_path := PATH=\$${PATH}:$(OUTDIR)/bin\
# convert parameters filesystem root to native notation
# does some real work only on windows, make sure not to
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 03ac2a8..c154a7a 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -144,7 +144,7 @@ else
gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH
endif
-gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib
+gb_Helper_set_ld_path :=
$(gb_Helper_LIBRARY_PATH_VAR)=\$(OUTDIR_FOR_BUILD)/lib\
# $(1): list of directory pathnames to append at the end of the ld path
define gb_Helper_extend_ld_path
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 00d01a1ca7811f5589530c7992d91ff38042668b Author: Jan Holesovsky ke...@suse.cz Date: Thu Dec 8 17:09:41 2011 +0100 Fix build on Linux. diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index c154a7a..33aa936 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -144,7 +144,7 @@ else gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH endif -gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=\$(OUTDIR_FOR_BUILD)/lib\ +gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib # $(1): list of directory pathnames to append at the end of the ld path define gb_Helper_extend_ld_path ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/platform/com_GCC_defs.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ddbe08e1dd54f397f6fe8c04b2147f21a49db8b1 Author: Jan Holesovsky ke...@suse.cz Date: Thu Dec 8 17:09:41 2011 +0100 Fix build on Linux. diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index c154a7a..33aa936 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -144,7 +144,7 @@ else gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH endif -gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=\$(OUTDIR_FOR_BUILD)/lib\ +gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib # $(1): list of directory pathnames to append at the end of the ld path define gb_Helper_extend_ld_path ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild
solenv/gbuild/gbuild.mk |2 +-
solenv/gbuild/platform/WNT_INTEL_MSC.mk |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9c4d6da729a882f1e5ddfb48e2fad7495449ff0b
Author: Jan Holesovsky ke...@suse.cz
Date: Thu Dec 8 23:55:45 2011 +0100
i18npool on Windows needed more fixes.
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..256261c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,7 +311,7 @@ gb_XSLTPROCTARGET :=
gb_XSLTPROC := xsltproc
else
gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $$(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
endif
ifeq ($(SYSTEM_PYTHON),YES)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 809d83c..5f8fb1c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE) $(subst
$(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst
$(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst
$(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst
$(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst
$(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst
$(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)
endef
-gb_Helper_set_ld_path := PATH=\$${PATH}:$(OUTDIR)/bin\
+gb_Helper_set_ld_path := PATH=$${PATH}:$(OUTDIR)/bin
# convert parameters filesystem root to native notation
# does some real work only on windows, make sure not to
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: vcl/inc vcl/win
vcl/inc/win/salids.hrc |2 ++ vcl/win/source/app/salinst.cxx |1 + vcl/win/source/src/salsrc.rc |2 ++ vcl/win/source/src/sd.ico |binary 4 files changed, 5 insertions(+) New commits: commit 30febe7998caa282ea9a7ebb53dd8517d5b2abc6 Author: Jan Holesovsky ke...@suse.cz Date: Mon Dec 5 10:10:24 2011 +0100 Revert remove StarDesktop icon This breaks unit tests in svtools. This reverts commit 915fe51391bdeee79f31173aeedab9746fc88000. diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc index 574bdc0..3049f11 100644 --- a/vcl/inc/win/salids.hrc +++ b/vcl/inc/win/salids.hrc @@ -115,4 +115,6 @@ #define SAL_RESID_BITMAP_50 11000 +#define SAL_RESID_ICON_DEFAULT 1 + #endif // _SV_SALIDS_HRC diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index d3fce7c..90841f7 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -541,6 +541,7 @@ SalInstance* CreateSalInstance() aWndClassEx.hbrBackground = 0; aWndClassEx.lpszMenuName= 0; aWndClassEx.lpszClassName = SAL_FRAME_CLASSNAMEW; +ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, aWndClassEx.hIcon, aWndClassEx.hIconSm ); if ( !RegisterClassExW( aWndClassEx ) ) return NULL; diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 956f862..147b80f 100644 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -117,4 +117,6 @@ SAL_RESID_POINTER_PAINTBRUSHCURSOR pntbrsh.cur SAL_RESID_BITMAP_50 BITMAP 50.bmp +SAL_RESID_ICON_DEFAULT ICONsd.ico + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/src/sd.ico b/vcl/win/source/src/sd.ico new file mode 100644 index 000..b2a0a07 Binary files /dev/null and b/vcl/win/source/src/sd.ico differ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - smoketestoo_native/makefile.mk solenv/gbuild
smoketestoo_native/makefile.mk |2 ++ solenv/gbuild/BuildDirs.mk |9 - 2 files changed, 2 insertions(+), 9 deletions(-) New commits: commit 0f1b0e5b7ad813069630e7ae719a800ecab640a8 Author: Jan Holesovsky ke...@suse.cz Date: Wed Nov 30 16:20:11 2011 +0100 Don't overwrite OUTDIR friends. diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk index 6a0933b..828546f 100644 --- a/solenv/gbuild/BuildDirs.mk +++ b/solenv/gbuild/BuildDirs.mk @@ -35,15 +35,6 @@ ifeq ($(strip $(SOLARENV)),) $(error SOLARENV variable is empty, no environment set, aborting) endif -# HACK -# unixify windoze paths -ifeq ($(OS_FOR_BUILD),WNT) -override WORKDIR := $(shell cygpath -u $(WORKDIR)) -override OUTDIR := $(shell cygpath -u $(OUTDIR)) -override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD)) -override SRCDIR := $(shell cygpath -u $(SRCDIR)) -endif - REPODIR := $(patsubst %/,%,$(dir $(SRCDIR))) # vim: set noet sw=4: commit 5d5df8c6615be1a382f660283dd0f251d1b3b278 Author: Jan Holesovsky ke...@suse.cz Date: Fri Dec 2 10:35:16 2011 +0100 Fix build on Windows. diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk index 333d646..bbfa24d 100755 --- a/smoketestoo_native/makefile.mk +++ b/smoketestoo_native/makefile.mk @@ -47,7 +47,9 @@ SHL1USE_EXPORTS = name DEF1NAME = $(SHL1TARGET) .INCLUDE: target.mk +.IF $(RUN_SMOKETEST) == YES .INCLUDE: installationtest.mk +.END .IF $(depend) == $(RUN_SMOKETEST) == YES # disable smoketest when cross-compiling for now; we can use wine at some stage (?) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/BuildDirs.mk |9 - 1 file changed, 9 deletions(-) New commits: commit 28275d470f3a062cfa27d72bbf89328af1e83c68 Author: Jan Holesovsky ke...@suse.cz Date: Wed Nov 30 16:20:11 2011 +0100 Don't overwrite OUTDIR friends. diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk index 6a0933b..828546f 100644 --- a/solenv/gbuild/BuildDirs.mk +++ b/solenv/gbuild/BuildDirs.mk @@ -35,15 +35,6 @@ ifeq ($(strip $(SOLARENV)),) $(error SOLARENV variable is empty, no environment set, aborting) endif -# HACK -# unixify windoze paths -ifeq ($(OS_FOR_BUILD),WNT) -override WORKDIR := $(shell cygpath -u $(WORKDIR)) -override OUTDIR := $(shell cygpath -u $(OUTDIR)) -override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD)) -override SRCDIR := $(shell cygpath -u $(SRCDIR)) -endif - REPODIR := $(patsubst %/,%,$(dir $(SRCDIR))) # vim: set noet sw=4: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: offapi/com
offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl |2 ++
1 file changed, 2 insertions(+)
New commits:
commit ebdc3ad1ee835212be4eb5fe99d5442c8baff920
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Nov 29 09:40:48 2011 +0100
Fix build in offapi.
diff --git a/offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl
b/offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl
index 786dba3..fe49579 100644
--- a/offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl
+++ b/offapi/com/sun/star/sheet/XSelectedSheetsSupplier.idl
@@ -28,6 +28,8 @@
#ifndef __com_sun_star_sheet_XSelectedSheetsSupplier_idl__
#define __com_sun_star_sheet_XSelectedSheetsSupplier_idl__
+#include com/sun/star/uno/XInterface.idl
+
module com { module sun { module star { module sheet {
interface XSelectedSheetsSupplier: com::sun::star::uno::XInterface
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMinGW.conf distro-configs/LibreOfficeOpenBSD.conf distro-configs/OxygenOfficeLinux.conf README.cross
README.cross |1 - distro-configs/LibreOfficeLinux.conf |1 - distro-configs/LibreOfficeMinGW.conf |1 - distro-configs/LibreOfficeOpenBSD.conf |1 - distro-configs/OxygenOfficeLinux.conf |1 - 5 files changed, 5 deletions(-) New commits: commit 96be3a199abb931068d15893f4bc83a24375d362 Author: Jan Holesovsky ke...@suse.cz Date: Tue Nov 29 13:41:09 2011 +0100 --with-system-libxslt is gone, remove it from the distro-configs. diff --git a/README.cross b/README.cross index 204b86d..cdcb37c 100644 --- a/README.cross +++ b/README.cross @@ -176,7 +176,6 @@ CXX_FOR_BUILD=ccache g++ --with-system-libwpg --with-system-libwps --with-system-libxml ---with-system-libxslt --with-system-lpsolve --with-system-mythes --with-system-neon diff --git a/distro-configs/LibreOfficeLinux.conf b/distro-configs/LibreOfficeLinux.conf index ddf6671..c00e6b9 100644 --- a/distro-configs/LibreOfficeLinux.conf +++ b/distro-configs/LibreOfficeLinux.conf @@ -8,7 +8,6 @@ --without-system-openssl --without-system-mozilla --without-system-mesa-headers ---without-system-libxslt --without-system-libxml --without-system-jpeg --without-system-jars diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf index aad9039..fcca57a 100644 --- a/distro-configs/LibreOfficeMinGW.conf +++ b/distro-configs/LibreOfficeMinGW.conf @@ -13,7 +13,6 @@ --with-system-icu --with-system-libpng --with-system-libxml ---with-system-libxslt --with-system-lpsolve --with-system-mythes --with-system-neon diff --git a/distro-configs/LibreOfficeOpenBSD.conf b/distro-configs/LibreOfficeOpenBSD.conf index 8f94b4b..b17175c 100644 --- a/distro-configs/LibreOfficeOpenBSD.conf +++ b/distro-configs/LibreOfficeOpenBSD.conf @@ -39,7 +39,6 @@ --with-system-jars --with-system-jpeg --with-system-libxml ---with-system-libxslt --with-system-mesa-headers --with-system-neon --with-system-openssl diff --git a/distro-configs/OxygenOfficeLinux.conf b/distro-configs/OxygenOfficeLinux.conf index f000ae6..31b3db4 100644 --- a/distro-configs/OxygenOfficeLinux.conf +++ b/distro-configs/OxygenOfficeLinux.conf @@ -58,7 +58,6 @@ --without-system-openssl --without-system-mozilla --without-system-mesa-headers ---without-system-libxslt --without-system-libxml --without-system-jpeg --without-system-jars ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 4 commits - extensions/CppunitTest_extensions_test_update.mk extensions/qa extensions/source
extensions/CppunitTest_extensions_test_update.mk | 25 +
extensions/qa/update/simple.xml | 10 ++
extensions/qa/update/test_update.cxx | 94 ++
extensions/source/update/check/updateprotocol.cxx | 27 +-
extensions/source/update/check/updateprotocol.hxx | 14 +++
extensions/source/update/feed/makefile.mk |1
extensions/source/update/feed/updatefeed.cxx | 68 +++
7 files changed, 164 insertions(+), 75 deletions(-)
New commits:
commit cb937da55c3ab3d238b97d6e0e709ea2a04d2c26
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Nov 30 00:11:01 2011 +0100
online update: Now check even the checkForUpdates().
diff --git a/extensions/qa/update/test_update.cxx
b/extensions/qa/update/test_update.cxx
index 57ff71c..84cbc4f 100644
--- a/extensions/qa/update/test_update.cxx
+++ b/extensions/qa/update/test_update.cxx
@@ -128,14 +128,14 @@ protected:
rtl::Reference UpdateCheck aController( UpdateCheck::get() );
if ( checkForUpdates( aInfo, m_xContext,
aController-getInteractionHandler(), m_xProvider,
-rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OS ) ),
-rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Arch ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( Linux ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( x86 ) ),
m_aRepositoryList,
-rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( BuildID ) ),
+rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( 100 ) ),
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( InstallSetID
) ) ) )
{
-//aController-setUpdateInfo( aInfo );
-// TODO check the result
+CPPUNIT_ASSERT( aInfo.Sources.size() == 1 );
+CPPUNIT_ASSERT( aInfo.Sources[0].URL == rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( http://www.libreoffice.org/download/; ) ) );
}
else
CPPUNIT_FAIL( Calling checkForUpdates() failed. );
commit 358ce1e9c1d85ae7590ecc2b2ddee9db81cf8b84
Author: Jan Holesovsky ke...@suse.cz
Date: Tue Nov 29 22:48:29 2011 +0100
online update: Cleanup after UpdateInformationProvider::load() rewrite.
diff --git a/extensions/source/update/feed/updatefeed.cxx
b/extensions/source/update/feed/updatefeed.cxx
index f5caafc..21bfecf 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -210,15 +210,11 @@ private:
uno::Reference ucb::XCommandProcessor const rxCommandProcessor);
UpdateInformationProvider(const uno::Referenceuno::XComponentContext
xContext,
- const uno::Reference
ucb::XContentIdentifierFactory xContentIdFactory,
- const uno::Reference ucb::XContentProvider
xContentProvider,
const uno::Reference xml::dom::XDocumentBuilder
xDocumentBuilder,
const uno::Reference xml::xpath::XXPathAPI
xXPathAPI);
const uno::Reference uno::XComponentContext m_xContext;
-const uno::Reference ucb::XContentIdentifierFactory m_xContentIdFactory;
-const uno::Reference ucb::XContentProvider m_xContentProvider;
const uno::Reference xml::dom::XDocumentBuilder m_xDocumentBuilder;
const uno::Reference xml::xpath::XXPathAPI m_xXPathAPI;
@@ -331,12 +327,10 @@ private:
UpdateInformationProvider::UpdateInformationProvider(
const uno::Referenceuno::XComponentContext xContext,
-const uno::Reference ucb::XContentIdentifierFactory xContentIdFactory,
-const uno::Reference ucb::XContentProvider xContentProvider,
const uno::Reference xml::dom::XDocumentBuilder xDocumentBuilder,
const uno::Reference xml::xpath::XXPathAPI xXPathAPI
-) : m_xContext(xContext), m_xContentIdFactory(xContentIdFactory),
-m_xContentProvider(xContentProvider), m_xDocumentBuilder(xDocumentBuilder),
+) : m_xContext(xContext),
+m_xDocumentBuilder(xDocumentBuilder),
m_xXPathAPI(xXPathAPI), m_aRequestHeaderList(1)
{
uno::Reference lang::XMultiServiceFactory xConfigurationProvider(
@@ -410,12 +404,6 @@ UpdateInformationProvider::createInstance(const
uno::Referenceuno::XComponentCo
UNISTRING( unable to obtain service manager from component
context ),
uno::Reference uno::XInterface ());
-uno::Reference ucb::XContentIdentifierFactory xContentIdFactory(
-xServiceManager-createInstanceWithContext( UNISTRING(
com.sun.star.ucb.UniversalContentBroker ), xContext ),
-uno::UNO_QUERY_THROW);
-
-uno::Reference ucb::XContentProvider
xContentProvider(xContentIdFactory, uno::UNO_QUERY_THROW);
-
uno::Reference xml::dom::XDocumentBuilder xDocumentBuilder(
xServiceManager-createInstanceWithContext( UNISTRING(
com.sun.star.xml.dom.DocumentBuilder ), xContext ),
uno
[Libreoffice-commits] .: oox/inc
oox/inc/oox/mathml/importutils.hxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dabe836c6ed66c5740582c17dbc39b2196608e6d
Author: Jan Holesovsky ke...@suse.cz
Date: Mon Nov 28 11:24:14 2011 +0100
Fix visibility problem on Windows.
diff --git a/oox/inc/oox/mathml/importutils.hxx
b/oox/inc/oox/mathml/importutils.hxx
index ad6ad6b..3a59320 100644
--- a/oox/inc/oox/mathml/importutils.hxx
+++ b/oox/inc/oox/mathml/importutils.hxx
@@ -71,7 +71,7 @@ public:
// One could theoretically use oox::AttributeList, but that complains if
the passed reference is empty,
// which would be complicated to avoid here. Also, parsers apparently
reuse the same instance of XFastAttributeList,
// which means using oox::AttributeList would make them all point to the
one instance.
-struct AttributeList
+struct OOX_DLLPUBLIC AttributeList
{
bool hasAttribute( int token ) const;
rtl::OUString attribute( int token, const rtl::OUString def =
rtl::OUString()) const;
@@ -82,7 +82,7 @@ public:
/**
Structure representing a tag, including its attributes and content text
immediatelly following it.
*/
-struct Tag
+struct OOX_DLLPUBLIC Tag
{
Tag( int token = XML_TOKEN_INVALID,
const com::sun::star::uno::Reference
com::sun::star::xml::sax::XFastAttributeList attributes =
com::sun::star::uno::Reference com::sun::star::xml::sax::XFastAttributeList
(),
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/source
oox/source/mathml/importutils.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 15da1a153e85da6e8b3d33bb2ed10328bdfb9286
Author: Jan Holesovsky ke...@suse.cz
Date: Fri Nov 25 13:18:03 2011 +0100
Fix build on Windows.
diff --git a/oox/source/mathml/importutils.cxx
b/oox/source/mathml/importutils.cxx
index 8037e2b..c6bf80c 100644
--- a/oox/source/mathml/importutils.cxx
+++ b/oox/source/mathml/importutils.cxx
@@ -107,7 +107,7 @@ XmlStream::Tag::Tag( int t, const uno::Reference
xml::sax::XFastAttributeList
}
-XmlStream::XmlStream::Tag::operator bool() const
+XmlStream::Tag::operator bool() const
{
return token != XML_TOKEN_INVALID;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: icc/source
icc/source/create_sRGB_profile/makefile.mk |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) New commits: commit d24778870ab356828c3cf6d884b6630433549e34 Author: Jan Holesovsky ke...@suse.cz Date: Thu Nov 24 10:55:12 2011 +0100 Fix icc cross-compilation. diff --git a/icc/source/create_sRGB_profile/makefile.mk b/icc/source/create_sRGB_profile/makefile.mk index 56a9a67..8aab067 100644 --- a/icc/source/create_sRGB_profile/makefile.mk +++ b/icc/source/create_sRGB_profile/makefile.mk @@ -47,8 +47,8 @@ EXTERNAL_WARNINGS_NOT_ERRORS=TRUE CFLAGS+=$(SAMPLEICC_CFLAGS) .ELSE CFLAGS+= \ --I$(PRJ)$(INPATH_FOR_BUILD)$/misc$/build$/SampleICC-1.3.2$/IccProfLib \ - -I$(PRJ)$(INPATH_FOR_BUILD)$/misc$/build$/SampleICC-1.3.2$/Contrib$/ICC_utils +-I$(PRJ)$(INPATH)$/misc$/build$/SampleICC-1.3.2$/IccProfLib \ +-I$(PRJ)$(INPATH)$/misc$/build$/SampleICC-1.3.2$/Contrib$/ICC_utils .ENDIF # --- Files @@ -82,4 +82,8 @@ APP1OBJS= $(OBJFILES) ALLTAR: $(TARGET)$(EXECPOST) $(TARGET)$(EXECPOST): $(BIN)$/$(TARGET)$(EXECPOST) +.IF $(CROSS_COMPILING) != YES cd $(BIN)$/ $(BIN)$/$(TARGET)$(EXECPOST) +.ELSE +cd $(BIN)$/ $(SRC_ROOT)$/icc$/$(INPATH_FOR_BUILD)$/bin$/$(TARGET) +.ENDIF ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: autodoc/source rdbmaker/source registry/tools sal/inc sal/osl solenv/gbuild solenv/inc
autodoc/source/exes/adc_uni/main.cxx|2 +-
rdbmaker/source/rdbmaker/rdbmaker.cxx |2 +-
registry/tools/regmerge.cxx |2 +-
registry/tools/regview.cxx |2 +-
sal/inc/sal/mathconf.h |8 +++-
sal/osl/w32/module.cxx |2 +-
sal/osl/w32/procimpl.cxx|8
solenv/gbuild/platform/WNT_INTEL_GCC.mk |5 +
solenv/inc/wntgcci.mk |5 +
9 files changed, 26 insertions(+), 10 deletions(-)
New commits:
commit 832e6d22935040fe61504c90838415fa55feb24d
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Nov 23 11:27:05 2011 +0100
Some trivial fixes for MinGW with -std=c++0x enabled; not finished.
diff --git a/autodoc/source/exes/adc_uni/main.cxx
b/autodoc/source/exes/adc_uni/main.cxx
index 6e5a11a..c119bb6 100644
--- a/autodoc/source/exes/adc_uni/main.cxx
+++ b/autodoc/source/exes/adc_uni/main.cxx
@@ -37,7 +37,7 @@
int
#ifdef WNT
-_cdecl
+__cdecl
#endif
main( intargc,
char * argv[] )
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx
b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index b20043e..fba8469 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -300,7 +300,7 @@ sal_Bool produceAllTypes(const OString typeName,
#if (defined UNX)
int main( int argc, char * argv[] )
#else
-int _cdecl main( int argc, char * argv[] )
+int __cdecl main( int argc, char * argv[] )
#endif
{
RdbOptions options;
diff --git a/registry/tools/regmerge.cxx b/registry/tools/regmerge.cxx
index 193209b..7b5997d 100644
--- a/registry/tools/regmerge.cxx
+++ b/registry/tools/regmerge.cxx
@@ -95,7 +95,7 @@ bool Options_Impl::initOptions_Impl (std::vector std::string
rArgs)
#if (defined UNX)
int main( int argc, char * argv[] )
#else
-int _cdecl main( int argc, char * argv[] )
+int __cdecl main( int argc, char * argv[] )
#endif
{
Options_Impl options(argv[0]);
diff --git a/registry/tools/regview.cxx b/registry/tools/regview.cxx
index 2cb11b8..57ebcea 100644
--- a/registry/tools/regview.cxx
+++ b/registry/tools/regview.cxx
@@ -43,7 +43,7 @@ using namespace registry::tools;
#if (defined UNX)
int main( int argc, char * argv[] )
#else
-int _cdecl main( int argc, char * argv[] )
+int __cdecl main( int argc, char * argv[] )
#endif
{
RegHandle hReg;
diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index d673f34..1e4b11b 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -37,6 +37,10 @@
#include ieeefp.h
#endif /* SOLARIS */
+#if defined(__cplusplus) ( defined(__GXX_EXPERIMENTAL_CXX0X__) ||
__cplusplus = 201103L )
+#include cmath
+#endif
+
#if defined __cplusplus
extern C {
#endif /* __cplusplus */
@@ -59,7 +63,9 @@ extern C {
/* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
-#if defined( WNT)
+#if defined(__cplusplus) ( defined(__GXX_EXPERIMENTAL_CXX0X__) ||
__cplusplus = 201103L )
+#define SAL_MATH_FINITE(d) std::isfinite(d)
+#elif defined( WNT)
#define SAL_MATH_FINITE(d) _finite(d)
#elif defined IOS
/* C++ is so nice. This is the only way I could come up with making
diff --git a/sal/osl/w32/module.cxx b/sal/osl/w32/module.cxx
index 07f750e..026cf51 100644
--- a/sal/osl/w32/module.cxx
+++ b/sal/osl/w32/module.cxx
@@ -79,7 +79,7 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *strModuleName,
sal_Int32 /*nRtldM
//on Windows XP and ERROR_INSUFFICIENT_BUFFER on Windows 7 (64bit)
if (hInstance == NULL Module-length 260)
{
-std::vectorsal_Unicode, rtl::Allocatorsal_Unicode
vec(Module-length + 1);
+std::vectorsal_Unicode vec(Module-length + 1);
DWORD len =
GetShortPathNameW(reinterpret_castLPCWSTR(Module-buffer),
reinterpret_castLPWSTR(vec[0]),
Module-length + 1);
if (len )
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 7ef6fb6..676c0e8 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -68,11 +68,11 @@ const rtl::OUString
QUOTE(RTL_CONSTASCII_USTRINGPARAM(\));
namespace /* private */
{
//#
-typedef std::listrtl::OUString, rtl::Allocatorrtl::OUString
string_container_t;
+typedef std::listrtl::OUString string_container_t;
typedef string_container_t::iterator string_container_iterator_t;
typedef string_container_t::const_iterator
string_container_const_iterator_t;
typedef std::pairstring_container_iterator_t,
string_container_iterator_t iterator_pair_t;
-typedef std::vectorsal_Unicode, rtl::Allocatorsal_Unicode
environment_container_t;
+typedef std::vectorsal_Unicode environment_container_t;
//#
/* Function object that compares two strings that are
@@ -312,7 +312,7 @@ namespace /* private */
rtl::OUString ret(path);
if (path.getLength
[Libreoffice-commits] .: sc/source
sc/source/ui/namedlg/namemgrtable.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 039cbb09351c133df81c4303ce30b327e07ff40a
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Nov 23 14:44:11 2011 +0100
'const_iterator' instead of 'iterator' to fix Windows build.
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx
b/sc/source/ui/namedlg/namemgrtable.cxx
index dc894a0..ad9ca9a 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -125,7 +125,7 @@ void ScRangeManagerTable::Init(const
boost::ptr_maprtl::OUString, ScRangeName
aLine.aScope = maGlobalString;
else
aLine.aScope = itr-first;
-for (ScRangeName::iterator it = pLocalRangeName-begin();
+for (ScRangeName::const_iterator it = pLocalRangeName-begin();
it != pLocalRangeName-end(); ++it)
{
if (!it-HasType(RT_DATABASE) !it-HasType(RT_SHARED))
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: canvas/source
canvas/source/cairo/cairo_textlayout.cxx | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) New commits: commit 6b74943cc6fb7983035b12f6cda8cb8e0c0a016b Author: Jan Holesovsky ke...@suse.cz Date: Tue Nov 22 21:56:33 2011 +0100 Using #if etc. inside OSL_TRACE is not a good idea, breaks Windows. diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 68143b5..3aac7a9 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -578,6 +578,11 @@ namespace cairocanvas cairo_set_font_matrix(pSCairo.get(), m); +#if (defined CAIRO_HAS_WIN32_SURFACE) (OSL_DEBUG_LEVEL 1) +#define TEMP_TRACE_FONT ::rtl::OUStringToOString( reinterpret_castconst sal_Unicode* (logfont.lfFaceName), RTL_TEXTENCODING_UTF8 ).getStr() +#else +#define TEMP_TRACE_FONT ::rtl::OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr() +#endif OSL_TRACE(\r\n:cairocanvas::TextLayout::draw(S,O,p,v,r): Size:(%d,%d), W:%d-%d, Pos (%d,%d), G(%d,%d,%d) %s%s%s%s || Name:%s - %s, aFont.GetWidth(), aFont.GetHeight(), @@ -590,14 +595,11 @@ namespace cairocanvas rSysFontData.bAntialias ? AA : , rSysFontData.bFakeBold ? FB : , rSysFontData.bFakeItalic ? FI : , -#if (defined CAIRO_HAS_WIN32_SURFACE) (OSL_DEBUG_LEVEL 1) - ::rtl::OUStringToOString( reinterpret_castconst sal_Unicode* (logfont.lfFaceName), RTL_TEXTENCODING_UTF8 ).getStr(), -#else - ::rtl::OUStringToOString( aFont.GetName(), RTL_TEXTENCODING_UTF8 ).getStr(), -#endif + TEMP_TRACE_FONT, ::rtl::OUStringToOString( maText.Text.copy( maText.StartPosition, maText.Length ), RTL_TEXTENCODING_UTF8 ).getStr() ); +#undef TEMP_TRACE_FONT cairo_show_glyphs(pSCairo.get(), cairo_glyphs[0], cairo_glyphs.size()); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: dtrans/StaticLibrary_dtobj.mk
dtrans/StaticLibrary_dtobj.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 1ef42cb0c53fc8d5adf259079833ba07dd12cb66 Author: Jan Holesovsky ke...@suse.cz Date: Mon Nov 21 13:58:27 2011 +0100 Fix MinGW build of dtrans. diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk index ee125ce..f3e535d 100644 --- a/dtrans/StaticLibrary_dtobj.mk +++ b/dtrans/StaticLibrary_dtobj.mk @@ -31,6 +31,7 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,dtobj)) $(eval $(call gb_StaticLibrary_set_include,dtobj,\ $$(INCLUDE) \ -I$(realpath $(SRCDIR)/dtrans/inc/pch) \ + -I$(SRCDIR)/solenv/inc \ )) $(eval $(call gb_StaticLibrary_add_api,dtobj,\ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/inc sc/source
sc/inc/queryentry.hxx |3 ++-
sc/source/core/tool/queryentry.cxx |3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
New commits:
commit 840e2f3ef5b73807403084edf09b5e53a097dcb3
Author: Jan Holesovsky ke...@suse.cz
Date: Sun Nov 20 15:12:50 2011 +0100
Inline ScQueryEntry::Item::Item() to fix Windows build.
diff --git a/sc/inc/queryentry.hxx b/sc/inc/queryentry.hxx
index 835c84a..5c88730 100644
--- a/sc/inc/queryentry.hxx
+++ b/sc/inc/queryentry.hxx
@@ -52,7 +52,8 @@ struct SC_DLLPUBLIC ScQueryEntry
doublemfVal;
rtl::OUString maString;
-Item();
+Item() : meType(ByValue), mfVal(0.0) {}
+
bool operator== (const Item r) const;
};
typedef std::vectorItem QueryItemsType;
diff --git a/sc/source/core/tool/queryentry.cxx
b/sc/source/core/tool/queryentry.cxx
index 47a88e7..be107e7 100644
--- a/sc/source/core/tool/queryentry.cxx
+++ b/sc/source/core/tool/queryentry.cxx
@@ -39,9 +39,6 @@
#define SC_EMPTYFIELDS ((double)0x0042)
#define SC_NONEMPTYFIELDS ((double)0x0043)
-ScQueryEntry::Item::Item() :
-meType(ByValue), mfVal(0.0) {}
-
bool ScQueryEntry::Item::operator== (const Item r) const
{
return meType == r.meType mfVal == r.mfVal
maString.equals(r.maString);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/inc
solenv/inc/_tg_shl.mk | 180 +- solenv/inc/tg_shl.mk | 18 - 2 files changed, 22 insertions(+), 176 deletions(-) New commits: commit 2d19e9bb07ccff3134f855812dddfda5c07b1fe4 Author: Jan Holesovsky ke...@suse.cz Date: Wed Nov 16 14:17:03 2011 +0100 Kill one usage of chrel.sed to fix build. diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk index f7aa241..7c537be 100644 --- a/solenv/inc/_tg_shl.mk +++ b/solenv/inc/_tg_shl.mk @@ -225,19 +225,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL1TARGETN:b)_linkinc.ls $(SHL1TARGETN) : $(LINKINCTARGETS) .ELSE -.IF $(SHL1USE_EXPORTS)==name -.IF $(GUI)==WNT -.IF $(COM)!=GCC -.IF $(SHL1LIBS)!= -SHL1LINKLIST=$(MISC)/$(SHL1TARGET)_link.lst -SHL1LINKLISTPARAM=@$(SHL1LINKLIST) -$(SHL1LINKLIST) : $(SHL1LIBS) -@@-$(RM) $@ -$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL1LIBS) $(i:s/.lib/.lin/)) $@ -.ENDIF # $(SHL1LIBS)!= -.ENDIF # $(COM)!=GCC -.ENDIF -.ENDIF # $(SHL1USE_EXPORTS)==name $(MISC)/%linkinc.ls: @echo . $@ @@ -254,8 +241,7 @@ $(SHL1TARGETN) : \ $(USE_SHL1DEF)\ $(USE_SHL1VERSIONMAP)\ $(SHL1RES)\ -$(SHL1DEPN) \ -$(SHL1LINKLIST) +$(SHL1DEPN) @echo Making:$(@:f) .IF $(GUI) == WNT .IF $(SHL1DEFAULTRES)!= @@ -395,7 +381,7 @@ $(SHL1TARGETN) : \ $(USE_1IMPLIB) \ $(STDOBJ) \ $(SHL1OBJS) $(SHL1VERSIONOBJ)) \ -$(SHL1LINKLISTPARAM) \ +$(SHL1LIBS) \ @$(mktmp $(SHL1STDLIBS) \ $(SHL1STDSHL) $(STDSHL1) \ $(SHL1LINKRES) \ @@ -729,19 +715,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL2TARGETN:b)_linkinc.ls $(SHL2TARGETN) : $(LINKINCTARGETS) .ELSE -.IF $(SHL2USE_EXPORTS)==name -.IF $(GUI)==WNT -.IF $(COM)!=GCC -.IF $(SHL2LIBS)!= -SHL2LINKLIST=$(MISC)/$(SHL2TARGET)_link.lst -SHL2LINKLISTPARAM=@$(SHL2LINKLIST) -$(SHL2LINKLIST) : $(SHL2LIBS) -@@-$(RM) $@ -$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL2LIBS) $(i:s/.lib/.lin/)) $@ -.ENDIF # $(SHL2LIBS)!= -.ENDIF # $(COM)!=GCC -.ENDIF -.ENDIF # $(SHL2USE_EXPORTS)==name $(MISC)/%linkinc.ls: @echo . $@ @@ -758,8 +731,7 @@ $(SHL2TARGETN) : \ $(USE_SHL2DEF)\ $(USE_SHL2VERSIONMAP)\ $(SHL2RES)\ -$(SHL2DEPN) \ -$(SHL2LINKLIST) +$(SHL2DEPN) @echo Making:$(@:f) .IF $(GUI) == WNT .IF $(SHL2DEFAULTRES)!= @@ -899,7 +871,7 @@ $(SHL2TARGETN) : \ $(USE_2IMPLIB) \ $(STDOBJ) \ $(SHL2OBJS) $(SHL2VERSIONOBJ)) \ -$(SHL2LINKLISTPARAM) \ +$(SHL2LIBS) \ @$(mktmp $(SHL2STDLIBS) \ $(SHL2STDSHL) $(STDSHL2) \ $(SHL2LINKRES) \ @@ -1233,19 +1205,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL3TARGETN:b)_linkinc.ls $(SHL3TARGETN) : $(LINKINCTARGETS) .ELSE -.IF $(SHL3USE_EXPORTS)==name -.IF $(GUI)==WNT -.IF $(COM)!=GCC -.IF $(SHL3LIBS)!= -SHL3LINKLIST=$(MISC)/$(SHL3TARGET)_link.lst -SHL3LINKLISTPARAM=@$(SHL3LINKLIST) -$(SHL3LINKLIST) : $(SHL3LIBS) -@@-$(RM) $@ -$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL3LIBS) $(i:s/.lib/.lin/)) $@ -.ENDIF # $(SHL3LIBS)!= -.ENDIF # $(COM)!=GCC -.ENDIF -.ENDIF # $(SHL3USE_EXPORTS)==name $(MISC)/%linkinc.ls: @echo . $@ @@ -1262,8 +1221,7 @@ $(SHL3TARGETN) : \ $(USE_SHL3DEF)\ $(USE_SHL3VERSIONMAP)\ $(SHL3RES)\ -$(SHL3DEPN) \ -$(SHL3LINKLIST) +$(SHL3DEPN) @echo Making:$(@:f) .IF $(GUI) == WNT .IF $(SHL3DEFAULTRES)!= @@ -1403,7 +1361,7 @@ $(SHL3TARGETN) : \ $(USE_3IMPLIB) \ $(STDOBJ) \ $(SHL3OBJS) $(SHL3VERSIONOBJ)) \ -$(SHL3LINKLISTPARAM) \ +$(SHL3LIBS) \ @$(mktmp $(SHL3STDLIBS) \ $(SHL3STDSHL) $(STDSHL3) \ $(SHL3LINKRES) \ @@ -1737,19 +1695,6 @@ LINKINCTARGETS+=$(MISC)/$(SHL4TARGETN:b)_linkinc.ls $(SHL4TARGETN) : $(LINKINCTARGETS) .ELSE -.IF $(SHL4USE_EXPORTS)==name -.IF $(GUI)==WNT -.IF $(COM)!=GCC -.IF $(SHL4LIBS)!= -SHL4LINKLIST=$(MISC)/$(SHL4TARGET)_link.lst -SHL4LINKLISTPARAM=@$(SHL4LINKLIST) -$(SHL4LINKLIST) : $(SHL4LIBS) -@@-$(RM) $@ -$(COMMAND_ECHO)$(SED) -f $(SOLARENV)/bin/chrel.sed $(foreach,i,$(SHL4LIBS) $(i:s/.lib/.lin/)) $@ -.ENDIF # $(SHL4LIBS)!= -.ENDIF # $(COM)!=GCC -.ENDIF -.ENDIF # $(SHL4USE_EXPORTS)==name
[Libreoffice-commits] .: oowintool post_download.in
oowintool| 16 +++-
post_download.in | 12 ++--
2 files changed, 17 insertions(+), 11 deletions(-)
New commits:
commit 41e995ec361cd466a3f287d3eb33c0080bdbb50c
Author: Jan Holesovsky ke...@suse.cz
Date: Wed Nov 16 20:59:16 2011 +0100
x64 merge modules are not mandatory, only warn when they are missing.
diff --git a/oowintool b/oowintool
index bf5c5d9..6cb98a3 100755
--- a/oowintool
+++ b/oowintool
@@ -46,7 +46,8 @@ sub print_syntax()
print commands:\n;
print--msvc-ver - print version of MSVC eg. 6.0\n;
print--msvc-copy-dlls dest - copy msvc[pr]??.dlls into
dest/msvcp??/\n;
-print--msvc-copy-msms dest - copy mscrt merge modules
dest/msm90/\n;
+print--msvc-copy-msms dest - copy mscrt merge modules to
dest/msm90/\n;
+print--msvc-copy-msms-64 ds- copy the x64 mscrt merge modules to
ds/msm90/\n;
print--msvc-productdir - print productdir\n;
print--msvs-productdir - print productdir\n;
print--dotnetsdk-dir - print .NET SDK path\n;
@@ -285,16 +286,17 @@ sub msvc_copy_dlls($)
}
}
-sub msvc_copy_msms($)
+sub msvc_copy_msms($$)
{
-my $dest = shift;
+# $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};
}
defined $common_files_path || return;
my $msm_path = (cygpath $common_files_path . \\Merge Modules, 'w',
$output_format);
-foreach $fname ('Microsoft_VC90_CRT_x86.msm',
'Microsoft_VC90_CRT_x86_x64.msm', 'policy_9_0_Microsoft_VC90_CRT_x86.msm',
'policy_9_0_Microsoft_VC90_CRT_x86_x64.msm') {
+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: $!;
}
@@ -330,7 +332,11 @@ while (@commands) {
} elsif ($opt eq '--msvc-copy-msms') {
my $dest = shift @commands;
defined $dest || die copy-msms requires a destination directory;
- msvc_copy_msms( $dest );
+ msvc_copy_msms( $dest, '' );
+} elsif ($opt eq '--msvc-copy-msms-64') {
+ my $dest = shift @commands;
+ defined $dest || die copy-msms-64 requires a destination directory;
+ msvc_copy_msms( $dest, '_x64' );
} elsif ($opt eq '--msvs-productdir') {
print_msvs_productdir();
} elsif ($opt eq '--msvc-productdir') {
diff --git a/post_download.in b/post_download.in
index c93cd27..ea6b943 100644
--- a/post_download.in
+++ b/post_download.in
@@ -38,9 +38,7 @@ dnl
===
dnl Windows builds - use oowintool to copy CRT dlls and manifest
dnl ===
if test $COM = MSC; then
- if ./oowintool --msvc-copy-dlls ./external/msvcp ; then
- :
-else
+if ! ./oowintool --msvc-copy-dlls ./external/msvcp ; then
AC_MSG_ERROR([oowintool failed to copy CRT])
fi
fi
@@ -49,11 +47,13 @@ dnl
===
dnl Windows builds - use oowintool to copy VC redist merge modules
dnl ===
if test $COM = MSC; then
- if ./oowintool --msvc-copy-msms ./external/msm90 ; then
- :
-else
+if ! ./oowintool --msvc-copy-msms ./external/msm90 ; then
AC_MSG_ERROR([oowintool failed to copy merge modules])
fi
+if ! ./oowintool --msvc-copy-msms-64 ./external/msm90 ; then
+ AC_MSG_WARN([oowintool failed to copy x64 merge modules, installation
+will lack the 64-bit Explorer extension])
+fi
fi
dnl ===
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
