[Libreoffice-commits] .: README.cross
README.cross |9 - 1 file changed, 9 deletions(-) New commits: commit 345693a06b853a11d9b8bdb64016ddb894cc8371 Author: Tor Lillqvist t...@iki.fi Date: Mon Mar 5 10:08:15 2012 +0200 Don't bother mentioning irrelevant autogen options diff --git a/README.cross b/README.cross index c610eda..818c335 100644 --- a/README.cross +++ b/README.cross @@ -155,9 +155,6 @@ CXX_FOR_BUILD=ccache g++ --disable-nss-module --disable-zenity --enable-python=system ---with-external-tar=/mnt/hemulen/ooo/git/master/src ---with-num-cpus=1 ---with-max-jobs=1 --with-system-altlinuxhyph --with-system-boost --with-system-cairo @@ -277,7 +274,6 @@ CC=ccache /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xct CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --with-distro=LibreOfficeiOS ---with-external-tar=/Volumes/ooo/git/master/src --with-system-nss --without-help --without-helppack-integration @@ -289,7 +285,6 @@ CC=ccache /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.p CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --with-distro=LibreOfficeiOS ---with-external-tar=/Volumes/ooo/git/master/src --with-system-nss --enable-debug --without-help @@ -310,7 +305,6 @@ CC_FOR_BUILD=ccache /Xcode3/usr/bin/gcc-4.0 -mmacosx-version-min=10.4 CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --enable-werror --with-distro=LibreOfficeiOS ---with-external-tar=/Users/tml/lo/10.4/src --with-system-nss --without-help --without-helppack-integration @@ -347,7 +341,6 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 -mmacosx-version-min=10.4 --disable-zenity --enable-werror --with-distro=LibreOfficeAndroid ---with-external-tar=/Volumes/ooo/git/master/src --disable-python --without-helppack-integration --without-myspell-dicts @@ -363,7 +356,6 @@ CXX_FOR_BUILD=ccache g++ --build=x86_64-unknown-linux-gnu --disable-zenity --with-distro=LibreOfficeAndroid ---with-external-tar=/mnt/hemulen/ooo/git/master/src --disable-python --with-num-cpus=1 --with-max-jobs=1 @@ -427,4 +419,3 @@ CXX_FOR_BUILD=ccache /Xcode3/usr/bin/g++-4.0 --host=powerpc-apple-darwin10 --disable-mozilla --disable-build-mozilla ---with-external-tar=/Volumes/ooo/git/master/src ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: framework/source
framework/source/services/desktop.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit b8550f6a66af279a34731a2d7921fb63550e463b
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Mon Mar 5 09:21:38 2012 +0100
add a space
diff --git a/framework/source/services/desktop.cxx
b/framework/source/services/desktop.cxx
index 3d164f0..8a03aa3 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -428,7 +428,7 @@ namespace
bool SAL_CALL Desktop::terminateQuickstarterToo()
throw( css::uno::RuntimeException )
{
-QuickstartSuppressoraQuickstartSuppressor(this, m_xQuickLauncher);
+QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
return terminate();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source sd/source unusedcode.easy
oox/inc/oox/helper/binaryinputstream.hxx |4
oox/inc/oox/helper/modelobjecthelper.hxx |3 ---
oox/inc/oox/helper/propertymap.hxx |1 -
oox/inc/oox/helper/propertyset.hxx | 14 +++---
oox/source/drawingml/customshapeproperties.cxx |1 -
oox/source/helper/binaryinputstream.cxx|8
oox/source/helper/modelobjecthelper.cxx| 13 -
oox/source/helper/propertymap.cxx |5 -
oox/source/helper/propertyset.cxx | 24
sd/source/filter/eppt/epptooxml.hxx|2 --
sd/source/filter/eppt/pptx-epptooxml.cxx | 16
unusedcode.easy|6 --
12 files changed, 3 insertions(+), 94 deletions(-)
New commits:
commit 2bdac353ce7e28611b546bcc8a5ea236c891f944
Author: Petr Vorel petr.vo...@gmail.com
Date: Sat Mar 3 02:16:31 2012 +0100
remove unused code
diff --git a/oox/inc/oox/helper/binaryinputstream.hxx
b/oox/inc/oox/helper/binaryinputstream.hxx
index 5add5f4..6e952a2 100644
--- a/oox/inc/oox/helper/binaryinputstream.hxx
+++ b/oox/inc/oox/helper/binaryinputstream.hxx
@@ -164,10 +164,6 @@ public:
template typename Type
voidskipArray( sal_Int32 nElemCount );
-/** Reads a NUL-terminated byte character array and returns the string.
- */
-::rtl::OString readNulCharArray();
-
/** Reads a NUL-terminated Unicode character array and returns the string.
*/
::rtl::OUString readNulUnicodeArray();
diff --git a/oox/inc/oox/helper/modelobjecthelper.hxx
b/oox/inc/oox/helper/modelobjecthelper.hxx
index 86459ec..10131de 100644
--- a/oox/inc/oox/helper/modelobjecthelper.hxx
+++ b/oox/inc/oox/helper/modelobjecthelper.hxx
@@ -56,9 +56,6 @@ public:
/** Returns true, if the object with the passed name exists in the
container. */
boolhasObject( const ::rtl::OUString rObjName ) const;
-/** Returns the object with the passed name from the container. */
-::com::sun::star::uno::Any getObject( const ::rtl::OUString rObjName )
const;
-
/** Inserts the passed object into the container, returns its final name.
*/
::rtl::OUString insertObject(
const ::rtl::OUString rObjName,
diff --git a/oox/inc/oox/helper/propertymap.hxx
b/oox/inc/oox/helper/propertymap.hxx
index 2696d49..dabd2e4 100644
--- a/oox/inc/oox/helper/propertymap.hxx
+++ b/oox/inc/oox/helper/propertymap.hxx
@@ -102,7 +102,6 @@ public:
#if OSL_DEBUG_LEVEL 0
#ifdef DBG_UTIL
static void dump( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
- void dump();
#endif
static void dumpCode( ::com::sun::star::uno::Reference
::com::sun::star::beans::XPropertySet rXPropSet);
void dumpCode();
diff --git a/oox/inc/oox/helper/propertyset.hxx
b/oox/inc/oox/helper/propertyset.hxx
index fd0c1a7..14ca79b 100644
--- a/oox/inc/oox/helper/propertyset.hxx
+++ b/oox/inc/oox/helper/propertyset.hxx
@@ -50,9 +50,9 @@ class PropertyMap;
com.sun.star.beans.XPropertySet interface then). The reference to the
property set will be kept as long as the instance of this class is alive.
-The functions getProperties() and setProperties() try to handle all passed
-values at once, using the com.sun.star.beans.XMultiPropertySet interface.
-If the implementation does not support the XMultiPropertySet interface, all
+The functions setProperties() tries to handle all passed values at once,
+using the com.sun.star.beans.XMultiPropertySet interface. If the
+implementation does not support the XMultiPropertySet interface, all
properties are handled separately in a loop.
*/
class PropertySet
@@ -103,14 +103,6 @@ public:
@return true = property contains true; false = property contains
false or error occurred. */
inline bool getBoolProperty( sal_Int32 nPropId ) const
{ bool bValue = false; return getProperty( bValue,
nPropId ) bValue; }
-
-/** Gets the specified properties from the property set. Tries to use the
XMultiPropertySet interface.
-@param orValues (out-parameter) The related property values.
-@param rPropNames The property names. MUST be ordered alphabetically.
*/
-voidgetProperties(
-::com::sun::star::uno::Sequence
::com::sun::star::uno::Any orValues,
-const ::com::sun::star::uno::Sequence
::rtl::OUString rPropNames ) const;
-
// Set properties -
/** Puts the passed any into the property set. */
diff --git a/oox/source/drawingml/customshapeproperties.cxx
b/oox/source/drawingml/customshapeproperties.cxx
index ab99e82..29844b8 100644
--- a/oox/source/drawingml/customshapeproperties.cxx
+++
[Libreoffice-commits] .: wizards/com
wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java | 45
+++---
1 file changed, 32 insertions(+), 13 deletions(-)
New commits:
commit ab6273ecece70432f3da35807b5484d9bfe91fdd
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Sun Mar 4 00:57:53 2012 +0100
Dropdown list in Letter Wizard are now ordered alphabetically
diff --git a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
index 736233c..55a1a0e 100644
--- a/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
+++ b/wizards/com/sun/star/wizards/letter/LetterWizardDialogImpl.java
@@ -27,6 +27,8 @@
/
package com.sun.star.wizards.letter;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.Vector;
import com.sun.star.lang.IllegalArgumentException;
import com.sun.star.lang.WrappedTargetException;
@@ -65,6 +67,20 @@ import com.sun.star.wizards.common.Helper;
public class LetterWizardDialogImpl extends LetterWizardDialog
{
+private class Strings
+{
+ public String Norm;
+ public String NormPath;
+ public String LanguageLabel;
+
+ public Strings(String norm, String normPath, String languageLabel)
+ {
+ Norm = norm;
+ NormPath = normPath;
+ LanguageLabel = languageLabel;
+ }
+}
+
protected void enterStep(int OldStep, int NewStep)
{
}
@@ -1163,9 +1179,8 @@ public class LetterWizardDialogImpl extends
LetterWizardDialog
e.printStackTrace();
}
-Vector NormsVector = new Vector();
-Vector NormsPathVector = new Vector();
-Vector LanguageLabelsVector = new Vector();
+ Vector StringsVector = new Vector();
+
String[] LanguageLabels;
boolean found = false;
@@ -1202,21 +1217,25 @@ public class LetterWizardDialogImpl extends
LetterWizardDialog
if (found)
{
-NormsVector.add(cIsoCode);
-NormsPathVector.add(nameList[i]);
-LanguageLabelsVector.add(lc.getLanguageString(MSID));
+ StringsVector.add(new Strings(cIsoCode, (String)nameList[i],
lc.getLanguageString(MSID)));
}
}
+ Collections.sort(StringsVector, new Comparator() {
+ public int compare(Object a, Object b) {
+ return
((Strings)a).LanguageLabel.compareTo(((Strings)b).LanguageLabel);
+ }
+ });
-Norms = new String[NormsVector.size()];
-NormsVector.toArray(Norms);
-
-NormPaths = new String[NormsPathVector.size()];
-NormsPathVector.toArray(NormPaths);
+Norms = new String[StringsVector.size()];
+NormPaths = new String[StringsVector.size()];
+LanguageLabels = new String[StringsVector.size()];
-LanguageLabels = new String[LanguageLabelsVector.size()];
-LanguageLabelsVector.toArray(LanguageLabels);
+ for(int i = 0; iStringsVector.size(); i++) {
+ Norms[i] = ((Strings)StringsVector.elementAt(i)).Norm;
+ NormPaths[i] = ((Strings)StringsVector.elementAt(i)).NormPath;
+ LanguageLabels[i] =
((Strings)StringsVector.elementAt(i)).LanguageLabel;
+ }
setControlProperty(lstLetterNorm, PropertyNames.STRING_ITEM_LIST,
LanguageLabels);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: autogen.sh
autogen.sh | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 0847fd63d773732ff3e441ef868957c55760d69a
Author: Thomas Collerton tom.col...@gmail.com
Date: Fri Mar 2 20:21:59 2012 +0100
Improvement to fdo#46565
diff --git a/autogen.sh b/autogen.sh
index 2133d07..2935619 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -146,7 +146,12 @@ if (defined $ENV{NOCONFIGURE}) {
if (scalar(@cmdline_args) 0) {
# if there's already an autogen.lastrun, make a backup first
if (-e autogen.lastrun) {
-system(cp autogen.lastrun autogen.lastrun.bak);
+open (my $fh, autogen.lastrun) || warn can't open
autogen.lastrun. \n;
+open (BAK, autogen.lastrun.bak) || warn can't create
backup file. \n;
+while ($fh) {
+print BAK;
+}
+close (BAK) close ($fh);
}
# print writing args to autogen.lastrun\n;
my $fh;
@@ -159,7 +164,8 @@ if (defined $ENV{NOCONFIGURE}) {
}
elsif ( ! -e autogen.lastrun)
{
-system(touch autogen.lastrun);
+open (my $fh, autogen.lastrun) || die can't create
autogen.lastrun;
+close ($fh);
}
print running ./configure with ' . join (' ', @args), '\n;
system (./configure, @args) die Error running configure;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - framework/inc framework/source
framework/inc/services/desktop.hxx|4 +++
framework/source/services/desktop.cxx | 30 ++
framework/source/services/sessionlistener.cxx | 15 -
3 files changed, 48 insertions(+), 1 deletion(-)
New commits:
commit 1baa3d0720b2ef9d12104a22ce03ed32b1e4b921
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Tue Feb 28 14:29:06 2012 +0100
lp#562027: fix logout with quickstarter
Signed-off-by: David Tardon dtar...@redhat.com
diff --git a/framework/inc/services/desktop.hxx
b/framework/inc/services/desktop.hxx
index 8dcc872..324a056 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -339,6 +339,10 @@ class Desktop : // interfaces
virtual ::rtl::OUString SAL_CALL getUntitledPrefix()
throw (css::uno::RuntimeException);
+// we need this wrapped terminate()-call to terminate even the
QuickStarter
+// non-virtual and non-UNO for now
+bool SAL_CALL terminateQuickstarterToo()
+throw( css::uno::RuntimeException );
//-
// protected methods
//-
diff --git a/framework/source/services/desktop.cxx
b/framework/source/services/desktop.cxx
index 5cdf44d..e3569ee 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -427,6 +427,36 @@ sal_Bool SAL_CALL Desktop::terminate()
return bTerminate;
}
+namespace
+{
+class QuickstartSuppressor
+{
+Desktop* const m_pDesktop;
+css::uno::Reference css::frame::XTerminateListener m_xQuickLauncher;
+public:
+QuickstartSuppressor(Desktop* const pDesktop, css::uno::Reference
css::frame::XTerminateListener xQuickLauncher)
+: m_pDesktop(pDesktop)
+, m_xQuickLauncher(xQuickLauncher)
+{
+SAL_INFO(fwk.desktop, temporary removing Quickstarter);
+if(m_xQuickLauncher.is())
+m_pDesktop-removeTerminateListener(m_xQuickLauncher);
+}
+~QuickstartSuppressor()
+{
+SAL_INFO(fwk.desktop, readding Quickstarter);
+if(m_xQuickLauncher.is())
+m_pDesktop-addTerminateListener(m_xQuickLauncher);
+}
+};
+}
+
+bool SAL_CALL Desktop::terminateQuickstarterToo()
+throw( css::uno::RuntimeException )
+{
+QuickstartSuppressor aQuickstartSuppressor(this, m_xQuickLauncher);
+return terminate();
+}
//=
void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference
css::frame::XTerminateListener xListener )
diff --git a/framework/source/services/sessionlistener.cxx
b/framework/source/services/sessionlistener.cxx
index 6dc4877..c150aa5 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -30,6 +30,7 @@
// my own includes
#include services/sessionlistener.hxx
+#include services/desktop.hxx
#include threadhelp/readguard.hxx
#include threadhelp/resetableguard.hxx
#include protocols.h
@@ -318,7 +319,19 @@ void SAL_CALL SessionListener::approveInteraction(
sal_Bool bInteractionGranted
StoreSession( sal_False );
css::uno::Reference css::frame::XDesktop xDesktop(
m_xSMGR-createInstance(SERVICENAME_DESKTOP), css::uno::UNO_QUERY_THROW);
-m_bTerminated = xDesktop-terminate();
+// honestly: how many implementations of XDesktop will we ever
have?
+// so casting this directly to the implementation
+Desktop* pDesktop(dynamic_castDesktop*(xDesktop.get()));
+if(pDesktop)
+{
+SAL_INFO(fwk.session, XDesktop is a framework::Desktop --
good.);
+m_bTerminated = pDesktop-terminateQuickstarterToo();
+}
+else
+{
+SAL_WARN(fwk.session, XDesktop is not a framework::Desktop
-- this should never happen.);
+m_bTerminated = xDesktop-terminate();
+}
if ( m_rSessionManager.is() )
{
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: hwpfilter/source
hwpfilter/source/drawing.h |7 +
hwpfilter/source/formula.cxx |8 +
hwpfilter/source/grammar.cxx | 152 +
hwpfilter/source/hbox.cxx | 38
hwpfilter/source/hbox.h| 22 ++--
hwpfilter/source/hiodev.cxx|2
hwpfilter/source/hpara.cxx |2
hwpfilter/source/hwpfile.cxx | 184 +++--
hwpfilter/source/hwpfile.h | 50 +--
hwpfilter/source/hwpread.cxx |6 -
hwpfilter/source/hwpreader.cxx | 58
11 files changed, 310 insertions(+), 219 deletions(-)
New commits:
commit db74590950afc8def36a42abae786be5ebad85d9
Author: Szabolcs Dezsi dezsisz...@hotmail.com
Date: Fri Mar 2 17:01:52 2012 +0100
Kill LinkedList in hwpfilter
diff --git a/hwpfilter/source/drawing.h b/hwpfilter/source/drawing.h
index b3835d2..2da39fb 100644
--- a/hwpfilter/source/drawing.h
+++ b/hwpfilter/source/drawing.h
@@ -31,8 +31,11 @@
#include precompile.h
+#include list
#include math.h
+#include osl/diagnose.h
+
#include hwplib.h
#include hwpfile.h
#include hiodev.h
@@ -600,12 +603,12 @@ static HWPPara *LoadParaList()
HWPFile *hwpf = GetCurrentDoc();
HIODev *hio = hwpf-SetIODevice(hmem);
-LinkedList HWPPara plist;
+std::list HWPPara* plist;
hwpf-ReadParaList(plist);
hwpf-SetIODevice(hio);
-return plist.count()? plist.first() : 0;
+return plist.size()? plist.front() : 0;
}
diff --git a/hwpfilter/source/formula.cxx b/hwpfilter/source/formula.cxx
index d2a73ac..ec44f7d 100644
--- a/hwpfilter/source/formula.cxx
+++ b/hwpfilter/source/formula.cxx
@@ -33,8 +33,9 @@
#include mapping.h
#include hwpeq.h
#include iostream
+#include list
-extern LinkedListNode nodelist;
+extern std::listNode* nodelist;
#ifndef DEBUG
@@ -645,9 +646,10 @@ int Formula::parse()
makeMathML( res );
}
Node *tmpNode;
- int count = nodelist.count();
+ int count = nodelist.size();
for( int i = 0 ; i count ; i++ ){
- tmpNode = nodelist.remove(0);
+ tmpNode = nodelist.front();
+ nodelist.pop_front();
delete tmpNode;
}
diff --git a/hwpfilter/source/grammar.cxx b/hwpfilter/source/grammar.cxx
index 2285aab..99c2f3c 100644
--- a/hwpfilter/source/grammar.cxx
+++ b/hwpfilter/source/grammar.cxx
@@ -71,12 +71,13 @@
#line 1 grammar.y
+#include list
#include stdlib.h
#include string.h
#include nodes.h
-LinkedListNode nodelist;
+std::listNode* nodelist;
Node *mainParse(const char *_code);
void yyerror(const char *);
@@ -909,291 +910,291 @@ yyreduce:
case 1:
#line 60 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 2:
#line 61 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 3:
#line 62 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 4:
#line 63 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 5:
#line 64 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 6:
#line 65 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.push_back(yyval.ptr); ;
break;}
case 7:
#line 66 grammar.y
-{ yyval.ptr = new Node(ID_IDENTIFIER); allocValue(yyval.ptr-value ,
yyvsp[0].str); debug(Identifier : %s\n,yyvsp[0].str);
nodelist.insert(yyval.ptr); ;
+{ yyval.ptr = new Node(ID_IDENTIFIER);
[Libreoffice-commits] .: starmath/source
starmath/source/mathtype.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 39d63cc9b9d307a77f9fe3986f92a6fa52bc552b Author: Olivier Hallot olivier.hal...@alta.org.br Date: Thu Mar 1 22:17:18 2012 -0300 Replace String by OUString Replace String by OUString diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 58d37d7..3995390 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -666,11 +666,11 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, sal_uInt8 nTag,nRecord; sal_uInt8 nTabType,nTabStops; sal_uInt16 nTabOffset; -String sFontName; +rtl::OUString sFontName; int i,nRet=1,newline=0; bool bSilent=false; int nPart=0; -String sPush,sMainTerm; +rtl::OUString sPush,sMainTerm; int nSetSize=0,nSetAlign=0; int nCurRow=0,nCurCol=0; bool bOpenString=false; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: starmath/source
starmath/source/mathtype.cxx |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit e0b0fe240e8110790e6f00a41e0482481027ff1c Author: Tor Lillqvist t...@iki.fi Date: Mon Mar 5 11:07:52 2012 +0200 Drop an unused variable diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 3995390..76ecaf4 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -666,7 +666,6 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, sal_uInt8 nTag,nRecord; sal_uInt8 nTabType,nTabStops; sal_uInt16 nTabOffset; -rtl::OUString sFontName; int i,nRet=1,newline=0; bool bSilent=false; int nPart=0; @@ -1762,8 +1761,7 @@ int MathType::HandleRecords(int nLevel,sal_uInt8 nSelector, break; aSeq.push_back(nChar8); } -sFontName = rtl::OUString(aSeq[0], aSeq.size(), -RTL_TEXTENCODING_MS_1252); +// Do nothing to the font name now in aSeq!? } break; case SIZE: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - hwpfilter/source sot/source vcl/source
hwpfilter/source/hbox.cxx| 30 +++
sot/source/sdstor/stgdir.hxx |1
vcl/source/gdi/outdev2.cxx | 54 +--
3 files changed, 76 insertions(+), 9 deletions(-)
New commits:
commit 78157d7634c0a75ceac4b614d3ca5b1763c6604a
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 5 09:36:40 2012 +
WaE: calling delete on the wrong thing
diff --git a/hwpfilter/source/hbox.cxx b/hwpfilter/source/hbox.cxx
index 3f9ea3d..df334ac 100644
--- a/hwpfilter/source/hbox.cxx
+++ b/hwpfilter/source/hbox.cxx
@@ -338,12 +338,18 @@ TxtBox::~TxtBox(void)
{
std::list HWPPara* ::iterator it = plists[ii].begin();
for (; it != plists[ii].end(); ++it)
-delete it;
+{
+HWPPara* pPara = *it;
+delete pPara;
+}
}
std::list HWPPara* ::iterator it = caption.begin();
for (; it != caption.end(); ++it)
-delete it;
+{
+HWPPara* pPara = *it;
+delete pPara;
+}
delete[]plists;
}
@@ -372,7 +378,10 @@ Picture::~Picture(void)
std::list HWPPara* ::iterator it = caption.begin();
for (; it != caption.end(); ++it)
-delete it;
+{
+HWPPara* pPara = *it;
+delete pPara;
+}
}
@@ -394,7 +403,10 @@ Hidden::~Hidden(void)
{
std::list HWPPara* ::iterator it = plist.begin();
for (; it != plist.end(); ++it)
-delete it;
+{
+HWPPara* pPara = *it;
+delete pPara;
+}
}
@@ -403,7 +415,10 @@ HeaderFooter::~HeaderFooter(void)
{
std::list HWPPara* ::iterator it = plist.begin();
for (; it != plist.end(); ++it)
-delete it;
+{
+HWPPara* pPara = *it;
+delete pPara;
+}
}
@@ -412,7 +427,10 @@ Footnote::~Footnote(void)
{
std::list HWPPara* ::iterator it = plist.begin();
for (; it != plist.end(); ++it)
-delete it;
+{
+HWPPara* pPara = *it;
+delete pPara;
+}
}
commit 96cf4e158fcc89adab81232ba63f11f97276853d
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 5 09:29:23 2012 +
unused inline
diff --git a/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx
index f260d42..8aaa359 100644
--- a/sot/source/sdstor/stgdir.hxx
+++ b/sot/source/sdstor/stgdir.hxx
@@ -125,7 +125,6 @@ public:
StgIterator( StgDirEntry rStg ) : StgAvlIterator( rStg.pDown ) {}
StgDirEntry* First() { return (StgDirEntry*) StgAvlIterator::First(); }
StgDirEntry* Next() { return (StgDirEntry*) StgAvlIterator::Next(); }
-StgDirEntry* Last() { return (StgDirEntry*) StgAvlIterator::Last(); }
StgDirEntry* Prev() { return (StgDirEntry*) StgAvlIterator::Prev(); }
};
commit 159b5088ee303f7adf6a4c0e5e72b32c37f9f910
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 5 09:13:55 2012 +
Resolves: fdo#31306 some icons don't get grayed when disabled
some of our menu icons are not RGBA, but our fade-out code only
handled images with an alpha channel, so we need to extend it
for bitmaps with alpha channel icons
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index 6d8987e..d6553ab 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -1162,6 +1162,44 @@ void OutputDevice::ImplDrawMask( const Point rDestPt,
const Size rDestSize,
}
}
+namespace
+{
+BitmapEx makeDisabledBitmap(const Bitmap rBitmap)
+{
+const Size aTotalSize( rBitmap.GetSizePixel() );
+Bitmap aGrey( aTotalSize, 8, Bitmap::GetGreyPalette( 256 ) );
+AlphaMask aGreyAlphaMask( aTotalSize );
+BitmapReadAccess* pBmp =
const_castBitmap(rBitmap).AcquireReadAccess();
+BitmapWriteAccess* pGrey = aGrey.AcquireWriteAccess();
+BitmapWriteAccess* pGreyAlphaMask =
aGreyAlphaMask.AcquireWriteAccess();
+
+if( pBmp pGrey pGreyAlphaMask )
+{
+BitmapColor aGreyVal( 0 );
+BitmapColor aGreyAlphaMaskVal( 0 );
+const int nLeft = 0, nRight = aTotalSize.Width();
+const int nTop = 0, nBottom = nTop + aTotalSize.Height();
+
+for( int nY = nTop; nY nBottom; ++nY )
+{
+for( int nX = nLeft; nX nRight; ++nX )
+{
+aGreyVal.SetIndex( pBmp-GetLuminance( nY, nX ) );
+pGrey-SetPixel( nY, nX, aGreyVal );
+
+aGreyAlphaMaskVal.SetIndex( static_cast sal_uInt8 (
128ul ) );
+pGreyAlphaMask-SetPixel( nY, nX, aGreyAlphaMaskVal );
+}
+}
+}
+
+const_castBitmap(rBitmap).ReleaseAccess( pBmp );
+aGrey.ReleaseAccess( pGrey );
+aGreyAlphaMask.ReleaseAccess( pGreyAlphaMask );
+return BitmapEx( aGrey, aGreyAlphaMask );
+}
+}
+
// --
void OutputDevice::DrawImage( const Point
[Libreoffice-commits] .: vcl/source
vcl/source/gdi/sallayout.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cecbf715396b5297a99d72e36526de5c24b927b4
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Mon Mar 5 04:08:28 2012 -0600
iterator are not ordered
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 781cb03..f7c2f15 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -841,7 +841,7 @@ bool GenericSalLayout::GetCharWidths( sal_Int32*
pCharWidths ) const
// calculate right x-position for this glyph cluster
// break if no more glyphs in layout
// break at next glyph cluster start
-while( (pG+1 end) !pG[1].IsClusterStart() )
+while( (pG+1 != end) !pG[1].IsClusterStart() )
{
// advance to next glyph in cluster
++pG;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basic/inc basic/source sfx2/source
basic/inc/basic/sbxbase.hxx|3 ++-
basic/source/sbx/sbxbase.cxx | 25 +++--
basic/source/sbx/sbxscan.cxx |1 +
sfx2/source/appl/appbaslib.cxx |4 +++-
sfx2/source/appl/appdde.cxx|4 +++-
5 files changed, 20 insertions(+), 17 deletions(-)
New commits:
commit 8d4fe3ed1fcd826200e2611e7743b755eff923a6
Author: Noel Grandin n...@peralex.com
Date: Mon Feb 27 16:26:41 2012 +0200
Convert SbxFactory from SV_DECL_PTRARR_DEL to boost::ptr_vector
diff --git a/basic/inc/basic/sbxbase.hxx b/basic/inc/basic/sbxbase.hxx
index 55341fa..e760c4f 100644
--- a/basic/inc/basic/sbxbase.hxx
+++ b/basic/inc/basic/sbxbase.hxx
@@ -33,12 +33,13 @@
#include svl/svarray.hxx
#include basic/sbxdef.hxx
#include basicdllapi.h
+#include boost/ptr_container/ptr_vector.hpp
class SbxFactory;
class SbxVariable;
class SbxBasicFormater;
-SV_DECL_PTRARR_DEL(SbxFacs,SbxFactory*,5)
+typedef boost::ptr_vectorSbxFactory SbxFacs;
// AppData structure for SBX:
struct SbxAppData
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index e2987d0..048ea3c 100644
--- a/basic/source/sbx/sbxbase.cxx
+++ b/basic/source/sbx/sbxbase.cxx
@@ -36,11 +36,10 @@
#include rtl/instance.hxx
#include rtl/oustringostreaminserter.hxx
#include sal/log.hxx
+#include boost/foreach.hpp
// AppData-Structure for SBX:
-SV_IMPL_PTRARR(SbxFacs,SbxFactory*);
-
TYPEINIT0(SbxBase)
namespace
@@ -147,28 +146,27 @@ void SbxBase::ResetError()
void SbxBase::AddFactory( SbxFactory* pFac )
{
SbxAppData r = GetSbxData_Impl();
-const SbxFactory* pTemp = pFac;
// From 1996-03-06: take the HandleLast-Flag into account
-sal_uInt16 nPos = r.aFacs.Count(); // Insert position
+sal_uInt16 nPos = r.aFacs.size(); // Insert position
if( !pFac-IsHandleLast() ) // Only if not self HandleLast
{
// Rank new factory in front of factories with HandleLast
while( nPos 0
-(static_castSbxFactory*(r.aFacs.GetObject( nPos-1
)))-IsHandleLast() )
+r.aFacs[ nPos-1 ].IsHandleLast() )
nPos--;
}
-r.aFacs.Insert( pTemp, nPos );
+r.aFacs.insert( r.aFacs.begin() + nPos, pFac );
}
void SbxBase::RemoveFactory( SbxFactory* pFac )
{
SbxAppData r = GetSbxData_Impl();
-for( sal_uInt16 i = 0; i r.aFacs.Count(); i++ )
+for(SbxFacs::iterator it = r.aFacs.begin(); it != r.aFacs.end(); ++it)
{
-if( r.aFacs.GetObject( i ) == pFac )
+if( (*it) == pFac )
{
-r.aFacs.Remove( i, 1 ); break;
+r.aFacs.release( it ).release(); break;
}
}
}
@@ -200,10 +198,9 @@ SbxBase* SbxBase::Create( sal_uInt16 nSbxId, sal_uInt32
nCreator )
// Unknown type: go over the factories!
SbxAppData r = GetSbxData_Impl();
SbxBase* pNew = NULL;
-for( sal_uInt16 i = 0; i r.aFacs.Count(); i++ )
+BOOST_FOREACH(SbxFactory rFac, r.aFacs)
{
-SbxFactory* pFac = r.aFacs.GetObject( i );
-pNew = pFac-Create( nSbxId, nCreator );
+pNew = rFac.Create( nSbxId, nCreator );
if( pNew )
break;
}
@@ -215,9 +212,9 @@ SbxObject* SbxBase::CreateObject( const rtl::OUString
rClass )
{
SbxAppData r = GetSbxData_Impl();
SbxObject* pNew = NULL;
-for( sal_uInt16 i = 0; i r.aFacs.Count(); i++ )
+BOOST_FOREACH(SbxFactory rFac, r.aFacs)
{
-pNew = r.aFacs.GetObject( i )-CreateObject( rClass );
+pNew = rFac.CreateObject( rClass );
if( pNew )
break;
}
diff --git a/basic/source/sbx/sbxscan.cxx b/basic/source/sbx/sbxscan.cxx
index 18bb46d..a253377 100644
--- a/basic/source/sbx/sbxscan.cxx
+++ b/basic/source/sbx/sbxscan.cxx
@@ -43,6 +43,7 @@
#include sbxres.hxx
#include basic/sbxbase.hxx
+#include basic/sbxfac.hxx
#include basic/sbxform.hxx
#include svtools/svtools.hrc
commit 695f0be4d184f4845cb2fedb1d64bb0597f52be4
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 12:20:37 2012 +0200
WaE: unused parameters in the DISABLE_SCRIPTING case
diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx
index a8fb71e..fcb3728 100644
--- a/sfx2/source/appl/appbaslib.cxx
+++ b/sfx2/source/appl/appbaslib.cxx
@@ -55,7 +55,9 @@ void SfxBasicManagerHolder::reset( BasicManager*
_pBasicManager )
{
impl_releaseContainers();
-#ifndef DISABLE_SCRIPTING
+#ifdef DISABLE_SCRIPTING
+(void) _pBasicManager;
+#else
// Note: we do not delete the old BasicManager. BasicManager instances are
// nowadays obtained from the BasicManagerRepository, and the ownership is
with
// the repository.
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index d46a016..5f2420a 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -350,7 +350,9 @@ long SfxObjectShell::DdeExecute
*/
{
-#ifndef DISABLE_SCRIPTING
+#ifdef DISABLE_SCRIPTING
+(void) rCmd;
+#else
StarBASIC* pBasic =
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source
sc/source/ui/unoobj/chart2uno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6444d7ed7a4f99ffcd8d04c5d27722d8c4d942b2
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Mar 4 00:05:33 2012 +0100
don't crash for empty input data in charts, fdo#46885
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 53b049b..93dcb56 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1565,7 +1565,7 @@ ScChart2DataProvider::createDataSource(
}
Reference chart2::data::XLabeledDataSequence xChartSeries =
lcl_createLabeledDataSequenceFromTokens(
pValueTokens, pLabelTokens, m_pDocument, this,
m_bIncludeHiddenCells ); //ownership of pointers is transfered!
-if ( xChartSeries.is()
xChartSeries-getValues()-getData().getLength() )
+if ( xChartSeries.is() xChartSeries-getValues().is()
xChartSeries-getValues()-getData().getLength() )
{
aSeqs.push_back( xChartSeries );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: lpsolve/lp_solve_5.5.patch
lpsolve/lp_solve_5.5.patch | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) New commits: commit d0b7ad3a446a17671b4cb7d3dd6a0106b0c46a91 Author: David Tardon dtar...@redhat.com Date: Mon Mar 5 08:38:51 2012 +0100 mingw: override gcc's definition of INLINE gcc defines INLINE to __inline, which leads to 'multiple definition of ...' error on use of liblpsolve.dll.a (e.g., in sccomp). Also use host ar and ranlib. diff --git a/lpsolve/lp_solve_5.5.patch b/lpsolve/lp_solve_5.5.patch index 590da2e..43c9e07 100644 --- a/lpsolve/lp_solve_5.5.patch +++ b/lpsolve/lp_solve_5.5.patch @@ -1,9 +1,11 @@ --- misc/build/lp_solve_5.5/lpsolve55/ccc.orig Sat Jun 11 21:27:18 2005 +++ misc/build/lp_solve_5.5/lpsolve55/ccc Sun May 22 11:20:19 2011 -@@ -1,25 +1,40 @@ +@@ -1,25 +1,42 @@ src='../lp_MDO.c ../shared/commonlib.c ../shared/mmio.c ../shared/myblas.c ../ini.c ../fortify.c ../colamd/colamd.c ../lp_rlp.c ../lp_crash.c ../bfp/bfp_LUSOL/lp_LUSOL.c ../bfp/bfp_LUSOL/LUSOL/lusol.c ../lp_Hash.c ../lp_lib.c ../lp_wlp.c ../lp_matrix.c ../lp_mipbb.c ../lp_MPS.c ../lp_params.c ../lp_presolve.c ../lp_price.c ../lp_pricePSE.c ../lp_report.c ../lp_scale.c ../lp_simplex.c ../lp_SOS.c ../lp_utils.c ../yacc_read.c' -c=cc ++ar=$AR +c=$CC ++ranlib=$RANLIB def= so= @@ -36,11 +38,12 @@ + opts='-O3' - $c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src +-$c -s -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src ++$c -s $inline -c -I.. -I../shared -I../bfp -I../bfp/bfp_LUSOL -I../bfp/bfp_LUSOL/LUSOL -I../colamd $opts $def -DYY_NEVER_INTERACTIVE -DPARSER_LP -DINVERSE_ACTIVE=INVERSE_LUSOL -DRoleIsExternalInvEngine $src -ar rv liblpsolve55.a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -ranlib liblpsolve55.a -+ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` -+ranlib liblpsolve55.$a ++$ar rv liblpsolve55.$a `echo $src|sed s/[.]c/.o/g|sed 's/[^ ]*\///g'` ++$ranlib liblpsolve55.$a if [ $so != ] then ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/JunitTest_sw_complex.mk sw/qa
sw/JunitTest_sw_complex.mk |2
sw/qa/complex/writer/CheckFields.java | 173
sw/qa/complex/writer/testdocuments/fdo39694.ott |binary
3 files changed, 175 insertions(+)
New commits:
commit 870e5a8e8251967b513b4255231ee9665b085431
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 5 12:20:48 2012 +0100
fdo#39694, fdo#42073: add junit test for these
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 28d3282..381417b 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
sw/qa/complex/writer/CheckBookmarks \
sw/qa/complex/writer/CheckCrossReferences \
sw/qa/complex/writer/CheckFlies \
+sw/qa/complex/writer/CheckFields \
sw/qa/complex/writer/CheckIndexedPropertyValues \
sw/qa/complex/writer/CheckNamedPropertyValues \
sw/qa/complex/writer/LoadSaveTest \
@@ -60,6 +61,7 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
complex.writer.CheckBookmarks \
complex.checkColor.CheckChangeColor \
complex.writer.CheckCrossReferences \
+complex.writer.CheckFields\
complex.writer.CheckFlies \
complex.writer.CheckIndexedPropertyValues \
complex.writer.CheckNamedPropertyValues \
diff --git a/sw/qa/complex/writer/CheckFields.java
b/sw/qa/complex/writer/CheckFields.java
new file mode 100644
index 000..f966e52
--- /dev/null
+++ b/sw/qa/complex/writer/CheckFields.java
@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2012 Red Hat, Inc., Michael Stahl mst...@redhat.com
(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.
+ */
+
+package complex.writer;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.container.XEnumeration;
+import com.sun.star.text.XText;
+import com.sun.star.text.XTextContent;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextField;
+import com.sun.star.text.XTextFieldsSupplier;
+import com.sun.star.text.XTextRange;
+import com.sun.star.text.XTextCursor;
+
+import org.openoffice.test.OfficeConnection;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import java.util.Set;
+import java.util.HashSet;
+
+
+public class CheckFields
+{
+private static final OfficeConnection connection = new OfficeConnection();
+
+@BeforeClass public static void setUpConnection() throws Exception {
+connection.setUp();
+//Thread.sleep(5000);
+}
+
+@AfterClass public static void tearDownConnection()
+throws InterruptedException, com.sun.star.uno.Exception
+{
+connection.tearDown();
+}
+
+private XMultiServiceFactory m_xMSF = null;
+private XComponentContext m_xContext = null;
+private XTextDocument m_xDoc = null;
+
+@Before public void before() throws Exception
+{
+m_xMSF = UnoRuntime.queryInterface(
+XMultiServiceFactory.class,
+connection.getComponentContext().getServiceManager());
+m_xContext = connection.getComponentContext();
+assertNotNull(could not get component context., m_xContext);
+m_xDoc = util.WriterTools.createTextDoc(m_xMSF);
+}
+
+@After public void after()
+{
+util.DesktopTools.closeDoc(m_xDoc);
+}
+
+@Test
+public void test_fdo39694_load() throws Exception
+{
+PropertyValue[] loadProps = new PropertyValue[2];
+loadProps[0] = new PropertyValue();
+loadProps[0].Name = AsTemplate;
+loadProps[0].Value = new Boolean(true);
[Libreoffice-commits] .: sw/qa
sw/qa/complex/writer/CheckFields.java |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 72a3c7a2778c493ef1d3f740a0b4b14f805c624a
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 5 12:32:39 2012 +0100
sw: CheckFields: oops, forgot to close the document
diff --git a/sw/qa/complex/writer/CheckFields.java
b/sw/qa/complex/writer/CheckFields.java
index f966e52..00c6916 100644
--- a/sw/qa/complex/writer/CheckFields.java
+++ b/sw/qa/complex/writer/CheckFields.java
@@ -36,6 +36,7 @@ import com.sun.star.lang.XServiceInfo;
import com.sun.star.beans.XPropertySet;
import com.sun.star.beans.PropertyValue;
import com.sun.star.container.XEnumeration;
+import com.sun.star.util.XCloseable;
import com.sun.star.text.XText;
import com.sun.star.text.XTextContent;
import com.sun.star.text.XTextDocument;
@@ -138,6 +139,11 @@ public class CheckFields
}
}
assertTrue(placeholders.isEmpty());
+XCloseable xClos = (XCloseable) UnoRuntime.queryInterface(
+XCloseable.class, xComp);
+if (xClos != null) {
+xClos.close(true);
+}
}
@Test
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - scp2/source
scp2/source/ooo/common_brand.scp |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f0865c76cb372a704728704923058c61dba32a4f Author: Thorsten Behrens tbehr...@suse.com Date: Mon Mar 5 12:00:48 2012 + Package the credits etc. in the right place on Mac Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 19f560f..a76b8b8 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1526,7 +1526,7 @@ End File gid_License_Odt BIN_FILE_BODY; #if defined MACOSX -Dir = gid_Brand_Dir_BasisLink; +Dir = gid_Dir_Bundle_Contents; #else Dir = gid_Dir_Brand_Root; #endif @@ -1537,7 +1537,7 @@ End File gid_Credits_Odt BIN_FILE_BODY; #if defined MACOSX -Dir = gid_Brand_Dir_BasisLink; +Dir = gid_Dir_Bundle_Contents; #else Dir = gid_Dir_Brand_Root; #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - xmloff/source
xmloff/source/chart/SchXMLTableContext.cxx | 10 +-
xmloff/source/chart/transporttypes.hxx | 12
2 files changed, 9 insertions(+), 13 deletions(-)
New commits:
commit 7f1f734113cc443caa2be4fbe376ab85d09eefac
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sat Mar 3 00:56:04 2012 +0100
don't create uno::Sequence with new, fdo#46825
The uno::Sequence copy c'tor creates a flat copy and increments the ref
count. So if you use new and later delete together with the copy
constructor you get a double delete.
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
(cherry picked from commit 61600b62068bf7837c532c8b32377984ee76af1e)
Signed-off-by: Eike Rathke er...@redhat.com
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/xmloff/source/chart/SchXMLTableContext.cxx
b/xmloff/source/chart/SchXMLTableContext.cxx
index 55c0368..f1f8af9 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -730,9 +730,9 @@ SvXMLImportContext*
SchXMLTableCellContext::CreateChildContext(
if( nPrefix == XML_NAMESPACE_TEXT IsXMLToken( rLocalName, XML_LIST )
mbReadText )
{
SchXMLCell rCell = mrTable.aData[ mrTable.nRowIndex ][
mrTable.nColumnIndex ];
-rCell.pComplexString = new Sequence OUString ();
+rCell.aComplexString = Sequence OUString ();
rCell.eType = SCH_CELL_TYPE_COMPLEX_STRING;
-pContext = new SchXMLTextListContext( GetImport(), rLocalName,
*rCell.pComplexString );
+pContext = new SchXMLTextListContext( GetImport(), rLocalName,
rCell.aComplexString );
mbReadText = sal_False;//don't apply text from text:p
}
// text:p element - read text (and range from text:id old version)
@@ -772,12 +772,12 @@ void lcl_ApplyCellToComplexLabel( const SchXMLCell
rCell, Sequence uno::Any
rComplexLabel.realloc(1);
rComplexLabel[0] = uno::makeAny( rCell.aString );
}
-else if( rCell.pComplexString rCell.eType ==
SCH_CELL_TYPE_COMPLEX_STRING )
+else if( rCell.aComplexString.getLength() rCell.eType ==
SCH_CELL_TYPE_COMPLEX_STRING )
{
-sal_Int32 nCount = rCell.pComplexString-getLength();
+sal_Int32 nCount = rCell.aComplexString.getLength();
rComplexLabel.realloc( nCount );
for( sal_Int32 nN=0; nNnCount; nN++)
-rComplexLabel[nN] = uno::makeAny((*rCell.pComplexString)[nN]);
+rComplexLabel[nN] = uno::makeAny((rCell.aComplexString)[nN]);
}
else if( rCell.eType == SCH_CELL_TYPE_FLOAT )
{
diff --git a/xmloff/source/chart/transporttypes.hxx
b/xmloff/source/chart/transporttypes.hxx
index ffa4111..cb03cbc 100644
--- a/xmloff/source/chart/transporttypes.hxx
+++ b/xmloff/source/chart/transporttypes.hxx
@@ -45,17 +45,17 @@ enum SchXMLCellType
struct SchXMLCell
{
rtl::OUString aString;
-::com::sun::star::uno::Sequence rtl::OUString * pComplexString;
+::com::sun::star::uno::Sequence rtl::OUString aComplexString;
double fValue;
SchXMLCellType eType;
rtl::OUString aRangeId;
-SchXMLCell() : pComplexString(0), fValue( 0.0 ), eType(
SCH_CELL_TYPE_UNKNOWN )
+SchXMLCell() : aComplexString(), fValue( 0.0 ), eType(
SCH_CELL_TYPE_UNKNOWN )
{}
SchXMLCell( const SchXMLCell rOther )
: aString( rOther.aString )
-, pComplexString( rOther.pComplexString ? new
::com::sun::star::uno::Sequence rtl::OUString ( *rOther.pComplexString ) : 0 )
+, aComplexString( rOther.aComplexString )
, fValue( rOther.fValue )
, eType( rOther.eType )
, aRangeId( rOther.aRangeId )
@@ -63,11 +63,7 @@ struct SchXMLCell
~SchXMLCell()
{
-if(pComplexString)
-{
-delete pComplexString;
-pComplexString=0;
-}
+
}
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - sc/source
sc/source/ui/namedlg/namedefdlg.cxx |8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 3730a7173298814a709a0bcbb2150288ea1c464d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Mar 2 23:48:44 2012 +0100
don't show an error message for empty names in Define Names, fdo#46816
Signed-off-by: Kohei Yoshida kohei.yosh...@suse.com
(cherry picked from commit f4f0ef5790bd06145d977183da0ee244c5c46058)
Signed-off-by: Eike Rathke er...@redhat.com
Signed-off-by: Michael Meeks michael.me...@suse.com
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx
b/sc/source/ui/namedlg/namedefdlg.cxx
index 45c600b..d060566 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -166,7 +166,13 @@ bool ScNameDefDlg::IsNameValid()
}
maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor());
-if (!ScRangeData::IsNameValid( aName, mpDoc ))
+if ( aName.isEmpty() )
+{
+maBtnAdd.Disable();
+maFtInfo.SetText(maStrInfoDefault);
+return false;
+}
+else if (!ScRangeData::IsNameValid( aName, mpDoc ))
{
maFtInfo.SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor());
maFtInfo.SetText(maErrInvalidNameStr);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - sc/source
sc/source/ui/unoobj/chart2uno.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 09c97519a1ccb8935787946b63cfb0b142f540e3
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Mar 4 00:05:33 2012 +0100
don't crash for empty input data in charts, fdo#46885
Signed-off-by: Michael Meeks michael.me...@suse.com
(cherry picked from commit 6444d7ed7a4f99ffcd8d04c5d27722d8c4d942b2)
Signed-off-by: Eike Rathke er...@redhat.com
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/sc/source/ui/unoobj/chart2uno.cxx
b/sc/source/ui/unoobj/chart2uno.cxx
index 53b049b..93dcb56 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1565,7 +1565,7 @@ ScChart2DataProvider::createDataSource(
}
Reference chart2::data::XLabeledDataSequence xChartSeries =
lcl_createLabeledDataSequenceFromTokens(
pValueTokens, pLabelTokens, m_pDocument, this,
m_bIncludeHiddenCells ); //ownership of pointers is transfered!
-if ( xChartSeries.is()
xChartSeries-getValues()-getData().getLength() )
+if ( xChartSeries.is() xChartSeries-getValues().is()
xChartSeries-getValues()-getData().getLength() )
{
aSeqs.push_back( xChartSeries );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: toolkit/inc toolkit/source
toolkit/inc/toolkit/controls/unocontrolmodel.hxx |6 -
toolkit/source/controls/unocontrolmodel.cxx | 135 +++
2 files changed, 48 insertions(+), 93 deletions(-)
New commits:
commit d578654354cc15b4d491b441412c1eb41a878b10
Author: Noel Grandin n...@peralex.com
Date: Wed Feb 29 11:07:02 2012 +0200
Convert ImplPropertyTable from tools/table.hxx to std::map
In the process, remove the ImplControlProperty struct,
since it was duplicating information already stored in the
key of the map.
diff --git a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
index 7aba0ec..13c3b38 100644
--- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
@@ -50,8 +50,9 @@
#include comphelper/uno3.hxx
#include list
+#include map
-class ImplPropertyTable;
+typedef std::mapsal_uInt16, ::com::sun::star::uno::Any ImplPropertyTable;
//
// class UnoControlModel
@@ -71,7 +72,7 @@ class TOOLKIT_DLLPUBLIC UnoControlModel :public
UnoControlModel_Base
,public ::cppu::OPropertySetHelper
{
private:
-ImplPropertyTable* mpData;
+ImplPropertyTable maData;
EventListenerMultiplexermaDisposeListeners;
protected:
@@ -112,7 +113,6 @@ protected:
public:
UnoControlModel( const ::com::sun::star::uno::Reference
::com::sun::star::lang::XMultiServiceFactory i_factory );
UnoControlModel( const UnoControlModel rModel );
-~UnoControlModel();
virtual UnoControlModel*Clone() const = 0;
diff --git a/toolkit/source/controls/unocontrolmodel.cxx
b/toolkit/source/controls/unocontrolmodel.cxx
index e00e791..53c5af0 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.cxx
@@ -60,6 +60,7 @@
#include uno/data.h
#include memory
+#include set
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -67,34 +68,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::i18n;
using ::com::sun::star::awt::FontDescriptor;
-struct ImplControlProperty
-{
-private:
-sal_uInt16 nId;
-::com::sun::star::uno::Any aValue;
-
-public:
-ImplControlProperty( const ImplControlProperty rProp ) : aValue(
rProp.aValue )
-{
-nId = rProp.nId;
-}
-
-ImplControlProperty( sal_uInt16 nT )
-{
-nId = nT;
-}
-
-ImplControlProperty( sal_uInt16 nT, const ::com::sun::star::uno::Any
rValue ) : aValue( rValue )
-{
-nId = nT;
-}
-
-sal_uInt16 GetId() const
{ return nId; }
-const ::com::sun::star::uno::Any GetValue() const
{ return aValue; }
-voidSetValue( const
::com::sun::star::uno::Any rValue ){ aValue = rValue; }
-};
-
-DECLARE_TABLE( ImplPropertyTable, ImplControlProperty* )
#define UNOCONTROL_STREAMVERSION(short)2
@@ -160,7 +133,6 @@ UnoControlModel::UnoControlModel()
OSL_ENSURE( false, UnoControlModel::UnoControlModel: not implemented.
Well, not really. );
// just implemented to let the various FooImplInheritanceHelper compile,
you should use the
// version taking a service factory
-mpData = new ImplPropertyTable;
}
UnoControlModel::UnoControlModel( const Reference XMultiServiceFactory
i_factory )
@@ -172,31 +144,16 @@ UnoControlModel::UnoControlModel( const Reference
XMultiServiceFactory i_fac
{
// Die Properties muessen vom Model in die Tabelle gestopft werden,
// nur vorhandene Properties sind gueltige Properties, auch wenn VOID.
-mpData = new ImplPropertyTable;
}
UnoControlModel::UnoControlModel( const UnoControlModel rModel )
: UnoControlModel_Base()
, MutexAndBroadcastHelper()
, OPropertySetHelper( BrdcstHelper )
+, maData( rModel.maData )
, maDisposeListeners( *this )
, maContext( rModel.maContext )
{
-mpData = new ImplPropertyTable;
-
-for ( sal_uInt32 n = rModel.mpData-Count(); n; )
-{
-ImplControlProperty* pProp = rModel.mpData-GetObject( --n );
-ImplControlProperty* pNew = new ImplControlProperty( *pProp );
-mpData-Insert( pNew-GetId(), pNew );
-}
-}
-
-UnoControlModel::~UnoControlModel()
-{
-for ( sal_uInt32 n = mpData-Count(); n; )
-delete mpData-GetObject( --n );
-delete mpData;
}
UnoControlModel* UnoControlModel::Clone() const
@@ -207,11 +164,12 @@ UnoControlModel* UnoControlModel::Clone() const
::com::sun::star::uno::Sequencesal_Int32
UnoControlModel::ImplGetPropertyIds() const
{
-sal_uInt32 nIDs = mpData-Count();
+sal_uInt32 nIDs = maData.size();
[Libreoffice-commits] .: Branch 'libreoffice-3-5-1' - connectivity/source
connectivity/source/drivers/postgresql/pq_tools.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 5cd4dc32f2518897ab48ed2afb09e363a39b7647 Author: Julien Nabet serval2...@yahoo.fr Date: Sat Mar 3 23:41:06 2012 +0100 Fix lacking break in switch Signed-off-by: Julien Nabet serval2...@yahoo.fr Signed-off-by: Petr Mladek pmla...@suse.cz Signed-off-by: Michael Meeks michael.me...@suse.com diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index c27bf15..7fa889f 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -532,6 +532,7 @@ static bool isOperator( char c ) case '?': case '$': ret = true; +break; default: ret = false; } ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: oox/inc oox/source
oox/inc/oox/drawingml/fillproperties.hxx |4 +++-
oox/source/drawingml/fillproperties.cxx |4
oox/source/drawingml/graphicshapecontext.cxx |3 +++
3 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit d082cb2060bbfab7d630b63423b90e449b36150f
Author: Muthu Subramanian sumu...@suse.com
Date: Mon Mar 5 19:09:45 2012 +0530
n747499: Wav/Audio files import - stub.
diff --git a/oox/inc/oox/drawingml/fillproperties.hxx
b/oox/inc/oox/drawingml/fillproperties.hxx
index 9f7c154..b528eae 100644
--- a/oox/inc/oox/drawingml/fillproperties.hxx
+++ b/oox/inc/oox/drawingml/fillproperties.hxx
@@ -34,6 +34,7 @@
#include com/sun/star/geometry/IntegerRectangle2D.hpp
#include oox/drawingml/color.hxx
#include oox/helper/helper.hxx
+#include oox/drawingml/embeddedwavaudiofile.hxx
namespace oox {
class GraphicHelper;
@@ -135,7 +136,8 @@ struct FillProperties
struct GraphicProperties
{
-BlipFillProperties maBlipProps;/// Properties for the graphic.
+BlipFillProperties maBlipProps;/// Properties for the
graphic.
+EmbeddedWAVAudioFilemaAudio;/// Audio file details
/** Overwrites all members that are explicitly set in rSourceProps. */
voidassignUsed( const GraphicProperties rSourceProps );
diff --git a/oox/source/drawingml/fillproperties.cxx
b/oox/source/drawingml/fillproperties.cxx
index ad6cf4b..0a49985 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -444,6 +444,10 @@ void GraphicProperties::pushToPropMap( PropertyMap
rPropMap, const GraphicHelpe
sal_Int16 nContrast = getLimitedValue sal_Int16, sal_Int32 (
maBlipProps.moContrast.get( 0 ) / PER_PERCENT, -100, 100 );
if( nContrast != 0 )
rPropMap[ PROP_AdjustContrast ] = nContrast;
+
+// TODO: Audio content, yet to be implemented
+if( !maAudio.msEmbed.isEmpty() )
+rPropMap[ PROP_Sound ] = maAudio.msEmbed;
}
//
diff --git a/oox/source/drawingml/graphicshapecontext.cxx
b/oox/source/drawingml/graphicshapecontext.cxx
index 016fbf3..f01854c 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -76,6 +76,9 @@ Reference XFastContextHandler
GraphicShapeContext::createFastChildContext( sa
case XML_blipFill:
xRet.set( new BlipFillContext( *this, xAttribs,
mpShapePtr-getGraphicProperties().maBlipProps ) );
break;
+case XML_wavAudioFile:
+getEmbeddedWAVAudioFile( getRelations(), xAttribs,
mpShapePtr-getGraphicProperties().maAudio );
+break;
}
if ((getNamespace( aElementToken ) == NMSP_vml) mpShapePtr)
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - svtools/source unusedcode.easy
svtools/source/edit/textdat2.hxx |8 +--
svtools/source/edit/textdata.cxx |5 --
svtools/source/edit/texteng.cxx | 84 +++
unusedcode.easy | 12 -
4 files changed, 47 insertions(+), 62 deletions(-)
New commits:
commit b5bc28fbb20d7432f243ce2808d8a535f02b0b5f
Author: Maciej Rumianowski maciej.rumianow...@gmail.com
Date: Sat Feb 25 16:07:42 2012 +0100
Remove unused code TESortedPositions and TEWritingDirectionInfos
diff --git a/unusedcode.easy b/unusedcode.easy
index 6aa0aaf..52a52e8 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -360,18 +360,6 @@ SwpHtStart::Insert(SwTxtAttr const**, unsigned short)
SwpHtStart::Insert(SwpHtStart const*, unsigned short, unsigned short)
SwpHtStart::Remove(SwTxtAttr const*, unsigned short)
SystemChildWindow::SystemChildWindow(Window*, ResId const)
-TESortedPositions::Insert(TESortedPositions const*, unsigned short, unsigned
short)
-TESortedPositions::Insert(unsigned long const, unsigned short)
-TESortedPositions::Insert(unsigned long const*, unsigned short)
-TESortedPositions::Remove(unsigned long const, unsigned short)
-TESortedPositions::Remove(unsigned short, unsigned short)
-TESortedPositions_SAR::Replace(unsigned long const, unsigned short)
-TESortedPositions_SAR::Replace(unsigned long const*, unsigned short, unsigned
short)
-TESortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char
(*)(unsigned long const, void*), void*)
-TEWritingDirectionInfos::Insert(TEWritingDirectionInfos const*, unsigned
short, unsigned short, unsigned short)
-TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const, unsigned short)
-TEWritingDirectionInfos::Replace(TEWritingDirectionInfo const*, unsigned
short, unsigned short)
-TEWritingDirectionInfos::_ForEach(unsigned short, unsigned short, unsigned
char (*)(TEWritingDirectionInfo const, void*), void*)
TaskBar::TaskBar(Window*, long)
TaskStatusFieldItem::TaskStatusFieldItem()
TempFile::IsValid() const
commit bf12ddb08f60aa261f83e1688c5d589a69eea0dd
Author: Maciej Rumianowski maciej.rumianow...@gmail.com
Date: Sat Feb 25 15:34:30 2012 +0100
Replace VARARR TEWritingDirectionInfos with std::vector
diff --git a/svtools/source/edit/textdat2.hxx b/svtools/source/edit/textdat2.hxx
index 945fd23..c34f5ec 100644
--- a/svtools/source/edit/textdat2.hxx
+++ b/svtools/source/edit/textdat2.hxx
@@ -35,6 +35,8 @@
#include vcl/virdev.hxx
#include vcl/cursor.hxx
+#include vector
+
class TextNode;
class TextView;
@@ -117,8 +119,6 @@ struct TEWritingDirectionInfo
}
};
-SV_DECL_VARARR( TEWritingDirectionInfos, TEWritingDirectionInfo, 0 )
-
class TextLine
{
private:
@@ -202,7 +202,7 @@ private:
TextLines maLines;
TETextPortionList maTextPortions;
-TEWritingDirectionInfos maWritingDirectionInfos;
+std::vectorTEWritingDirectionInfo maWritingDirectionInfos;
sal_uInt16 mnInvalidPosStart;
@@ -233,7 +233,7 @@ public:
TextNode* GetNode() const { return mpNode; }
TextLines GetLines() { return maLines; }
TETextPortionList GetTextPortions() { return maTextPortions; }
-TEWritingDirectionInfos GetWritingDirectionInfos() { return
maWritingDirectionInfos; }
+std::vectorTEWritingDirectionInfo GetWritingDirectionInfos() { return
maWritingDirectionInfos; }
sal_uInt16 GetLineNumber( sal_uInt16 nIndex, sal_Bool
bInclEnd );
diff --git a/svtools/source/edit/textdata.cxx b/svtools/source/edit/textdata.cxx
index 4023c86..894887d 100644
--- a/svtools/source/edit/textdata.cxx
+++ b/svtools/source/edit/textdata.cxx
@@ -33,7 +33,6 @@
#include tools/debug.hxx
SV_IMPL_PTRARR( TextLines, TextLinePtr );
-SV_IMPL_VARARR( TEWritingDirectionInfos, TEWritingDirectionInfo );
// -
@@ -173,7 +172,7 @@ void TEParaPortion::MarkInvalid( sal_uInt16 nStart, short
nDiff )
}
}
-maWritingDirectionInfos.Remove( 0, maWritingDirectionInfos.Count() );
+maWritingDirectionInfos.clear();
mbInvalid = sal_True;
}
@@ -191,7 +190,7 @@ void TEParaPortion::MarkSelectionInvalid( sal_uInt16
nStart, sal_uInt16 /*nEnd*/
// nInvalidPosEnd = pNode-Len();
}
-maWritingDirectionInfos.Remove( 0, maWritingDirectionInfos.Count() );
+maWritingDirectionInfos.clear();
mnInvalidDiff = 0;
mbInvalid = sal_True;
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index f727de2..6baf8a9 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -65,6 +65,7 @@
#include unicode/ubidi.h
#include set
+#include vector
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
@@ -1835,9 +1836,9 @@ void TextEngine::CreateTextPortions( sal_uLong nPara,
sal_uInt16 nStartPos )
}
aPositions.insert(
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - sw/inc sw/source
sw/inc/txtfld.hxx |3 ++-
sw/source/core/crsr/crstrvl.cxx |3 ++-
sw/source/core/txtnode/atrfld.cxx |7 +--
sw/source/core/txtnode/thints.cxx |3 ++-
sw/source/core/unocore/unofield.cxx |5 ++---
5 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit be999f1bc692a122e36add37f23312edad8f81d2
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 2 21:32:27 2012 +0100
fdo#42073: sw: expand all text fields when setting properties:
SwXTextField::setPropertyValue: call Expand() for all text fields
Fixes getPresentation returning stale values.
(regression from CWS sw34bf01, 8485708f3001fca132c3353c464fe7187ef62bed)
Also, without this the text formatting does not actually update and the new
content is not displayed until some other unrelated editing operation.
(cherry picked from commit e3dfae0741aae8581cd3fc713ba1b4459bb22d88)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index 6b0ddc7..77134ec 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1911,9 +1911,8 @@ void SwXTextField::setPropertyValue(const OUString
rPropertyName, const uno::An
const_castSwFmtFld*(pFmtFld)-Broadcast(SwFmtFldHint( 0,
SWFMTFLD_CHANGED ));
}
-// changes of the expanded string have to be notified
-//#to the SwTxtFld
-if(RES_DBFLD == nWhich pFmtFld-GetTxtFld())
+// fdo#42073 notify SwTxtFld about changes of the expanded string
+if (pFmtFld-GetTxtFld())
{
pFmtFld-GetTxtFld()-Expand();
}
commit 81828ab68a37715505b19988cdb4508ee0477c68
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 2 19:02:03 2012 +0100
fdo#39694: SwTxtFld: do expand the field in the ctor
While only the text formatting is able to expand all fields correctly,
this is still good enough for many field types and fixes a race
condition when the field value is requested before layout is finished.
(regression from CWS sw34bf01, 8485708f3001fca132c3353c464fe7187ef62bed)
(cherry picked from commit 9519deda120b73b72e75d89c3b2ae3d66220ec2d)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 3ecabb8..f574811 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -42,7 +42,8 @@ class SwTxtFld : public SwTxtAttr
SwTxtNode * m_pTxtNode;
public:
-SwTxtFld(SwFmtFld rAttr, xub_StrLen const nStart);
+SwTxtFld(SwFmtFld rAttr, xub_StrLen const nStart,
+bool const bInClipboard);
virtual ~SwTxtFld();
void CopyFld( SwTxtFld *pDest ) const;
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 31c289c..9e4d6f0 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -710,7 +710,8 @@ sal_Bool SwCrsrShell::MoveFldType( const SwFieldType*
pFldType, sal_Bool bNext,
SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField(
(SwDateTimeFieldType*)pDoc-GetSysFldType( RES_DATETIMEFLD ) )
);
-pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex() );
+pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex(),
+pDoc-IsClipBoard() );
pTxtFld-ChgTxtNode( pTNd );
}
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index 4789c5f..dbf4d82 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -284,9 +284,12 @@ sal_Bool SwFmtFld::IsProtect() const
|*
*/
-SwTxtFld::SwTxtFld(SwFmtFld rAttr, xub_StrLen const nStartPos)
+SwTxtFld::SwTxtFld(SwFmtFld rAttr, xub_StrLen const nStartPos,
+bool const bInClipboard)
: SwTxtAttr( rAttr, nStartPos )
-, m_aExpand( rAttr.GetFld()-ExpandField(true) )
+// fdo#39694 the ExpandField here may not give the correct result in all cases,
+// but is better than nothing
+, m_aExpand( rAttr.GetFld()-ExpandField(bInClipboard) )
, m_pTxtNode( 0 )
{
rAttr.pTxtAttr = this;
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index d17cb7f..b11682b 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1035,7 +1035,8 @@ SwTxtAttr* MakeTxtAttr( SwDoc rDoc, SfxPoolItem rAttr,
pNew = new SwTxtINetFmt( (SwFmtINetFmt)rNew, nStt, nEnd );
break;
case RES_TXTATR_FIELD:
-pNew = new SwTxtFld( static_castSwFmtFld (rNew), nStt );
+pNew = new SwTxtFld( static_castSwFmtFld (rNew), nStt,
+rDoc.IsClipBoard() );
break;
case RES_TXTATR_FLYCNT:
{
___
Libreoffice-commits mailing list
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 3 commits - sw/JunitTest_sw_complex.mk sw/qa
sw/JunitTest_sw_complex.mk |2
sw/qa/complex/writer/CheckFields.java | 179
sw/qa/complex/writer/testdocuments/fdo39694.ott |binary
3 files changed, 181 insertions(+)
New commits:
commit 2ece920ad7d3876ee6c49bd819ee9aaf99c72e66
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 5 12:32:39 2012 +0100
sw: CheckFields: oops, forgot to close the document
(cherry picked from commit 72a3c7a2778c493ef1d3f740a0b4b14f805c624a)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/qa/complex/writer/CheckFields.java
b/sw/qa/complex/writer/CheckFields.java
index f966e52..00c6916 100644
--- a/sw/qa/complex/writer/CheckFields.java
+++ b/sw/qa/complex/writer/CheckFields.java
@@ -36,6 +36,7 @@ import com.sun.star.lang.XServiceInfo;
import com.sun.star.beans.XPropertySet;
import com.sun.star.beans.PropertyValue;
import com.sun.star.container.XEnumeration;
+import com.sun.star.util.XCloseable;
import com.sun.star.text.XText;
import com.sun.star.text.XTextContent;
import com.sun.star.text.XTextDocument;
@@ -138,6 +139,11 @@ public class CheckFields
}
}
assertTrue(placeholders.isEmpty());
+XCloseable xClos = (XCloseable) UnoRuntime.queryInterface(
+XCloseable.class, xComp);
+if (xClos != null) {
+xClos.close(true);
+}
}
@Test
commit 24a5db94da34fc40c713d6534b5f741dfee50e44
Author: Michael Stahl mst...@redhat.com
Date: Mon Mar 5 12:20:48 2012 +0100
fdo#39694, fdo#42073: add junit test for these
(cherry picked from commit 870e5a8e8251967b513b4255231ee9665b085431)
Signed-off-by: Miklos Vajna vmik...@suse.cz
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 4ed426d..b242c8d 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
sw/qa/complex/writer/CheckBookmarks \
sw/qa/complex/writer/CheckCrossReferences \
sw/qa/complex/writer/CheckFlies \
+sw/qa/complex/writer/CheckFields \
sw/qa/complex/writer/CheckIndexedPropertyValues \
sw/qa/complex/writer/CheckNamedPropertyValues \
sw/qa/complex/writer/LoadSaveTest \
@@ -60,6 +61,7 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
complex.writer.CheckBookmarks \
complex.checkColor.CheckChangeColor \
complex.writer.CheckCrossReferences \
+complex.writer.CheckFields\
complex.writer.CheckFlies \
complex.writer.CheckIndexedPropertyValues \
complex.writer.CheckNamedPropertyValues \
diff --git a/sw/qa/complex/writer/CheckFields.java
b/sw/qa/complex/writer/CheckFields.java
new file mode 100644
index 000..f966e52
--- /dev/null
+++ b/sw/qa/complex/writer/CheckFields.java
@@ -0,0 +1,173 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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) 2012 Red Hat, Inc., Michael Stahl mst...@redhat.com
(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.
+ */
+
+package complex.writer;
+
+import com.sun.star.uno.UnoRuntime;
+import com.sun.star.uno.XComponentContext;
+import com.sun.star.lang.XMultiServiceFactory;
+import com.sun.star.lang.XComponent;
+import com.sun.star.lang.XServiceInfo;
+import com.sun.star.beans.XPropertySet;
+import com.sun.star.beans.PropertyValue;
+import com.sun.star.container.XEnumeration;
+import com.sun.star.text.XText;
+import com.sun.star.text.XTextContent;
+import com.sun.star.text.XTextDocument;
+import com.sun.star.text.XTextField;
+import com.sun.star.text.XTextFieldsSupplier;
+import com.sun.star.text.XTextRange;
+import com.sun.star.text.XTextCursor;
+
+import org.openoffice.test.OfficeConnection;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+import java.util.Set;
+import java.util.HashSet;
+
+
+public class
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - sw/inc sw/source
sw/inc/txtfld.hxx |3 ++-
sw/source/core/crsr/crstrvl.cxx |3 ++-
sw/source/core/txtnode/atrfld.cxx |7 +--
sw/source/core/txtnode/thints.cxx |3 ++-
sw/source/core/unocore/unofield.cxx |5 ++---
5 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit ea137eef21554dfc7b8420b1f40e7a26eaaa5210
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 2 21:32:27 2012 +0100
fdo#42073: sw: expand all text fields when setting properties:
SwXTextField::setPropertyValue: call Expand() for all text fields
Fixes getPresentation returning stale values.
(regression from CWS sw34bf01, 8485708f3001fca132c3353c464fe7187ef62bed)
Also, without this the text formatting does not actually update and the new
content is not displayed until some other unrelated editing operation.
(cherry picked from commit e3dfae0741aae8581cd3fc713ba1b4459bb22d88)
Signed-off-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: Miklos Vajna vmik...@frugalware.org
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index 8351970..ca9511b 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1902,9 +1902,8 @@ void SwXTextField::setPropertyValue(const OUString
rPropertyName, const uno::An
const_castSwFmtFld*(pFmtFld)-Broadcast(SwFmtFldHint( 0,
SWFMTFLD_CHANGED ));
}
-// changes of the expanded string have to be notified
-//#to the SwTxtFld
-if(RES_DBFLD == nWhich pFmtFld-GetTxtFld())
+// fdo#42073 notify SwTxtFld about changes of the expanded string
+if (pFmtFld-GetTxtFld())
{
pFmtFld-GetTxtFld()-Expand();
}
commit bad17b39d1567c5f58c439093c8f8b692e106cdc
Author: Michael Stahl mst...@redhat.com
Date: Fri Mar 2 19:02:03 2012 +0100
fdo#39694: SwTxtFld: do expand the field in the ctor
While only the text formatting is able to expand all fields correctly,
this is still good enough for many field types and fixes a race
condition when the field value is requested before layout is finished.
(regression from CWS sw34bf01, 8485708f3001fca132c3353c464fe7187ef62bed)
(cherry picked from commit 9519deda120b73b72e75d89c3b2ae3d66220ec2d)
Signed-off-by: Miklos Vajna vmik...@suse.cz
Signed-off-by: Miklos Vajna vmik...@frugalware.org
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 4b06c3f..246de80 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -42,7 +42,8 @@ class SwTxtFld : public SwTxtAttr
SwTxtNode * m_pTxtNode;
public:
-SwTxtFld(SwFmtFld rAttr, xub_StrLen const nStart);
+SwTxtFld(SwFmtFld rAttr, xub_StrLen const nStart,
+bool const bInClipboard);
virtual ~SwTxtFld();
void CopyFld( SwTxtFld *pDest ) const;
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index ca4b282..0bf0aae 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -711,7 +711,8 @@ sal_Bool SwCrsrShell::MoveFldType( const SwFieldType*
pFldType, sal_Bool bNext,
SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField(
(SwDateTimeFieldType*)pDoc-GetSysFldType( RES_DATETIMEFLD ) )
);
-pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex() );
+pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex(),
+pDoc-IsClipBoard() );
pTxtFld-ChgTxtNode( pTNd );
}
diff --git a/sw/source/core/txtnode/atrfld.cxx
b/sw/source/core/txtnode/atrfld.cxx
index 30eb065..a2e7462 100644
--- a/sw/source/core/txtnode/atrfld.cxx
+++ b/sw/source/core/txtnode/atrfld.cxx
@@ -287,9 +287,12 @@ sal_Bool SwFmtFld::IsProtect() const
|*
*/
-SwTxtFld::SwTxtFld(SwFmtFld rAttr, xub_StrLen const nStartPos)
+SwTxtFld::SwTxtFld(SwFmtFld rAttr, xub_StrLen const nStartPos,
+bool const bInClipboard)
: SwTxtAttr( rAttr, nStartPos )
-, m_aExpand( rAttr.GetFld()-ExpandField(true) )
+// fdo#39694 the ExpandField here may not give the correct result in all cases,
+// but is better than nothing
+, m_aExpand( rAttr.GetFld()-ExpandField(bInClipboard) )
, m_pTxtNode( 0 )
{
rAttr.pTxtAttr = this;
diff --git a/sw/source/core/txtnode/thints.cxx
b/sw/source/core/txtnode/thints.cxx
index b67be35..4f0de8e 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -1041,7 +1041,8 @@ SwTxtAttr* MakeTxtAttr( SwDoc rDoc, SfxPoolItem rAttr,
pNew = new SwTxtINetFmt( (SwFmtINetFmt)rNew, nStt, nEnd );
break;
case RES_TXTATR_FIELD:
-pNew = new SwTxtFld( static_castSwFmtFld (rNew), nStt );
+pNew = new SwTxtFld( static_castSwFmtFld (rNew), nStt,
+rDoc.IsClipBoard() );
break;
case RES_TXTATR_FLYCNT:
{
[Libreoffice-commits] .: 2 commits - basegfx/Library_basegfx.mk basegfx/source basegfx/StaticLibrary_basegfx_s.mk sot/source sw/source unusedcode.easy
basegfx/Library_basegfx.mk |1
basegfx/StaticLibrary_basegfx_s.mk |1
basegfx/source/polygon/b3dpolygonclipper.cxx | 132 ---
sot/source/sdstor/stgavl.cxx |5 -
sot/source/sdstor/stgavl.hxx |1
sot/source/sdstor/stgdir.hxx |1
sw/source/filter/ww8/ww8par.cxx |5 -
unusedcode.easy | 11 +-
8 files changed, 9 insertions(+), 148 deletions(-)
New commits:
commit b1bb3821f47cc5031798e62e2fecad3bb5dfd6ba
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 5 14:35:39 2012 +
Related: rhbz#799630 survive unknown/broken nIdctHint values
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 7f7354f..f417f3d 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2844,9 +2844,9 @@ void
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString rAddS
else if (nScript == MSASCII) //Force weak chars in ascii range to use
LATIN font
nLclIdctHint = 0;
+sal_uInt16 nForceFromFontId = 0;
if (nLclIdctHint != 0xFF)
{
-sal_uInt16 nForceFromFontId = 0;
switch (nLclIdctHint)
{
case 0:
@@ -2861,7 +2861,10 @@ void
SwWW8ImplReader::emulateMSWordAddTextToParagraph(const rtl::OUString rAddS
default:
break;
}
+}
+if (nForceFromFontId != 0)
+{
//Now we know that word would use the nForceFromFontId font for
this range
//Try and determine what script writer would assign this range to
commit 273960e01f814656e12c960599fc49b5a4c4416e
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 5 13:40:48 2012 +
callcatcher: update list
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 74c1412..0dc5f90 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -94,7 +94,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/polygon/b3dpolygontools \
basegfx/source/polygon/b2dlinegeometry \
basegfx/source/polygon/b3dpolypolygontools \
- basegfx/source/polygon/b3dpolygonclipper \
basegfx/source/polygon/b2dpolygonclipper \
basegfx/source/polygon/b2dpolypolygoncutter \
basegfx/source/polygon/b2dpolygon \
diff --git a/basegfx/StaticLibrary_basegfx_s.mk
b/basegfx/StaticLibrary_basegfx_s.mk
index 62ecf98..001417f 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -98,7 +98,6 @@ $(eval $(call
gb_StaticLibrary_add_generated_exception_objects,basegfx_s,\
CustomTarget/basegfx/source/polygon/b3dpolygontools \
CustomTarget/basegfx/source/polygon/b2dlinegeometry \
CustomTarget/basegfx/source/polygon/b3dpolypolygontools \
- CustomTarget/basegfx/source/polygon/b3dpolygonclipper \
CustomTarget/basegfx/source/polygon/b2dpolygonclipper \
CustomTarget/basegfx/source/polygon/b2dpolypolygoncutter \
CustomTarget/basegfx/source/polygon/b2dpolygon \
diff --git a/basegfx/source/polygon/b3dpolygonclipper.cxx
b/basegfx/source/polygon/b3dpolygonclipper.cxx
deleted file mode 100644
index 728fc46..000
--- a/basegfx/source/polygon/b3dpolygonclipper.cxx
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include basegfx/polygon/b3dpolygonclipper.hxx
-#include osl/diagnose.h
-#include basegfx/polygon/b3dpolygontools.hxx
-#include basegfx/numeric/ftools.hxx
-#include basegfx/matrix/b3dhommatrix.hxx
-#include basegfx/polygon/b3dpolygontools.hxx
-#include
[Libreoffice-commits] .: binfilter/bf_svtools binfilter/inc
binfilter/bf_svtools/source/memtools/tl_contnr.cxx | 81 -
binfilter/bf_svtools/source/misc/tl_strimp.cxx | 26 --
binfilter/bf_svtools/source/misc/tl_tustring.cxx | 26 ++
binfilter/inc/bf_svx/svdetc.hxx|1
binfilter/inc/bf_svx/svdlayer.hxx |3
binfilter/inc/bf_svx/svdmark.hxx |2
binfilter/inc/bf_tools/contnr.hxx |9 --
binfilter/inc/bf_tools/stack.hxx |3
binfilter/inc/bf_tools/string.hxx |1
binfilter/inc/bf_tools/unqidx.hxx |2
10 files changed, 26 insertions(+), 128 deletions(-)
New commits:
commit 271e19336e594195ac6e40dd01ba62d2592f24e8
Author: Caolán McNamara caol...@redhat.com
Date: Mon Mar 5 13:41:31 2012 +
callcatcher: shrink unused inlines
diff --git a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
index e548d00..f0b48a9 100644
--- a/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
+++ b/binfilter/bf_svtools/source/memtools/tl_contnr.cxx
@@ -788,17 +788,6 @@ void Container::ImpInsert( void* p, CBlock* pBlock,
sal_uInt16 nIndex )
|*
*/
-void Container::Insert( void* p )
-{
-ImpInsert( p, pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Insert()
-|*
-*/
-
void Container::Insert( void* p, sal_uIntPtr nIndex )
{
if ( nCount = nIndex )
@@ -903,21 +892,6 @@ void* Container::ImpRemove( CBlock* pBlock, sal_uInt16
nIndex )
|*
*/
-void* Container::Remove()
-{
-// Wenn kein Item vorhanden ist, NULL zurueckgeben
-if ( !nCount )
-return NULL;
-else
-return ImpRemove( pCurBlock, nCurIndex );
-}
-
-/*
-|*
-|*Container::Remove()
-|*
-*/
-
void* Container::Remove( sal_uIntPtr nIndex )
{
// Ist Index nicht innerhalb des Containers, dann NULL zurueckgeben
@@ -1133,23 +1107,6 @@ void Container::Clear()
/*
|*
-|*Container::GetCurObject()
-|*
-*/
-
-void* Container::GetCurObject() const
-{
-DBG_CHKTHIS( Container, DbgCheckContainer );
-
-// NULL, wenn Container leer
-if ( !nCount )
-return NULL;
-else
-return pCurBlock-GetObject( nCurIndex );
-}
-
-/*
-|*
|*Container::GetCurPos()
|*
*/
@@ -1206,44 +1163,6 @@ void* Container::GetObject( sal_uIntPtr nIndex ) const
/*
|*
-|*Container::GetPos()
-|*
-*/
-
-sal_uIntPtr Container::GetPos( const void* p ) const
-{
-DBG_CHKTHIS( Container, DbgCheckContainer );
-
-void** pNodes;
-CBlock* pTemp;
-sal_uIntPtr nTemp;
-sal_uInt16 nBlockCount;
-sal_uInt16 i;
-
-// Block suchen
-pTemp = pFirstBlock;
-nTemp = 0;
-while ( pTemp )
-{
-pNodes = pTemp-GetNodes();
-i = 0;
-nBlockCount = pTemp-Count();
-while ( i nBlockCount )
-{
-if ( p == *pNodes )
-return nTemp+i;
-pNodes++;
-i++;
-}
-nTemp += nBlockCount;
-pTemp = pTemp-GetNextBlock();
-}
-
-return CONTAINER_ENTRY_NOTFOUND;
-}
-
-/*
-|*
|*Container::Seek()
|*
*/
diff --git a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
index 83ca2c0..5ced5bc 100644
--- a/binfilter/bf_svtools/source/misc/tl_strimp.cxx
+++ b/binfilter/bf_svtools/source/misc/tl_strimp.cxx
@@ -738,32 +738,6 @@ STRING STRING::ToLowerAscii()
// ---
-STRING STRING::ToUpperAscii()
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-sal_Int32 nIndex = 0;
-sal_Int32 nLen = mpData-mnLen;
-STRCODE*pStr = mpData-maStr;
-while ( nIndex nLen )
-{
-// Ist das Zeichen zwischen 'a' und 'z' dann umwandeln
-if ( (*pStr = 97) (*pStr = 122) )
-{
-// Daten kopieren, wenn noetig
-pStr = ImplCopyStringData( pStr );
-*pStr -= 32;
-
[Libreoffice-commits] .: Branch 'libreoffice-3-5' - writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 30 +++--
writerfilter/source/rtftok/rtfdocumentimpl.hxx |1
2 files changed, 29 insertions(+), 2 deletions(-)
New commits:
commit e67c7884d10caf4714d152f1d98c0f4f7e6c10f1
Author: Miklos Vajna vmik...@suse.cz
Date: Wed Feb 22 11:38:29 2012 +0100
implement RTF import of non-box paragraph borders
(cherry picked from commit 343b52ee76f1a88a27007319af644dcce76536cc)
Signed-off-by: Michael Stahl mst...@redhat.com
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 413a82f..737350b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -146,7 +146,7 @@ static RTFSprms lcl_getLastAttributes(RTFSprms rSprms, Id
nId)
static void lcl_putBorderProperty(std::stackRTFParserState aStates, Id nId,
RTFValue::Pointer_t pValue)
{
-if (aStates.top().nBorderState == BORDER_PARAGRAPH)
+if (aStates.top().nBorderState == BORDER_PARAGRAPH_BOX)
for (int i = 0; i 4; i++)
{
RTFValue::Pointer_t p =
aStates.top().aParagraphSprms.find(lcl_getParagraphBorder(i));
@@ -156,6 +156,12 @@ static void
lcl_putBorderProperty(std::stackRTFParserState aStates, Id nId, R
rAttributes-push_back(make_pair(nId, pValue));
}
}
+else if (aStates.top().nBorderState == BORDER_PARAGRAPH)
+{
+// Attributes of the last border type
+RTFSprms rAttributes =
lcl_getLastAttributes(aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PrBase_pBdr);
+rAttributes-push_back(make_pair(nId, pValue));
+}
else if (aStates.top().nBorderState == BORDER_CELL)
{
// Attributes of the last border type
@@ -1754,7 +1760,7 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcLeft,
pValue));
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcBottom,
pValue));
m_aStates.top().aParagraphSprms-push_back(make_pair(NS_sprm::LN_PBrcRight,
pValue));
-m_aStates.top().nBorderState = BORDER_PARAGRAPH;
+m_aStates.top().nBorderState = BORDER_PARAGRAPH_BOX;
}
break;
case RTF_LTRSECT:
@@ -1831,6 +1837,26 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
m_aStates.top().nBorderState = BORDER_PAGE;
}
break;
+case RTF_BRDRT:
+case RTF_BRDRL:
+case RTF_BRDRB:
+case RTF_BRDRR:
+{
+RTFSprms aAttributes;
+RTFSprms aSprms;
+RTFValue::Pointer_t pValue(new RTFValue(aAttributes, aSprms));
+switch (nKeyword)
+{
+case RTF_BRDRT: nParam = lcl_getParagraphBorder(0); break;
+case RTF_BRDRL: nParam = lcl_getParagraphBorder(1); break;
+case RTF_BRDRB: nParam = lcl_getParagraphBorder(2); break;
+case RTF_BRDRR: nParam = lcl_getParagraphBorder(3); break;
+default: break;
+}
+lcl_putNestedSprm(m_aStates.top().aParagraphSprms,
NS_ooxml::LN_CT_PrBase_pBdr, nParam, pValue);
+m_aStates.top().nBorderState = BORDER_PARAGRAPH;
+}
+break;
case RTF_CLVMGF:
{
RTFValue::Pointer_t pValue(new
RTFValue(NS_ooxml::LN_Value_ST_Merge_restart));
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 0e92eb4..713fd7d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -116,6 +116,7 @@ namespace writerfilter {
{
BORDER_NONE,
BORDER_PARAGRAPH,
+BORDER_PARAGRAPH_BOX,
BORDER_CELL,
BORDER_PAGE
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/inc filter/source oovbaapi/ooo vbahelper/inc vbahelper/source
filter/inc/filter/msfilter/msvbahelper.hxx|4
filter/source/msfilter/msvbahelper.cxx| 128 ++
oovbaapi/ooo/vba/XApplicationBase.idl |2
vbahelper/inc/vbahelper/vbaapplicationbase.hxx|1
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 49
5 files changed, 181 insertions(+), 3 deletions(-)
New commits:
commit 75fbed472cd689c8cc0b89e13a97969d77a0ea7c
Author: Noel Power noel.po...@novell.com
Date: Mon Mar 5 14:54:04 2012 +
vba implementation for Application.OnKey
diff --git a/filter/inc/filter/msfilter/msvbahelper.hxx
b/filter/inc/filter/msfilter/msvbahelper.hxx
index affc8b2..99b20c1 100644
--- a/filter/inc/filter/msfilter/msvbahelper.hxx
+++ b/filter/inc/filter/msfilter/msvbahelper.hxx
@@ -33,8 +33,8 @@
#include com/sun/star/lang/XInitialization.hpp
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/script/vba/XVBAMacroResolver.hpp
+#include com/sun/star/awt/KeyEvent.hpp
#include filter/msfilter/msfilterdllapi.h
-
namespace ooo {
namespace vba {
@@ -55,7 +55,7 @@ MSFILTER_DLLPUBLIC ::rtl::OUString getDefaultProjectName(
SfxObjectShell* pShell
MSFILTER_DLLPUBLIC ::rtl::OUString resolveVBAMacro( SfxObjectShell* pShell,
const ::rtl::OUString rLibName, const ::rtl::OUString rModuleName, const
::rtl::OUString rMacroName );
MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell,
const ::rtl::OUString rMacroName, bool bSearchGlobalTemplates = false );
MSFILTER_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const
String sMacroName, com::sun::star::uno::Sequence com::sun::star::uno::Any
aArgs, com::sun::star::uno::Any aRet, const com::sun::star::uno::Any aCaller
);
-
+MSFILTER_DLLPUBLIC ::com::sun::star::awt::KeyEvent parseKeyEvent( const
::rtl::OUString sKey ) throw (::com::sun::star::uno::RuntimeException);
//
typedef ::cppu::WeakImplHelper3
diff --git a/filter/source/msfilter/msvbahelper.cxx
b/filter/source/msfilter/msvbahelper.cxx
index 07a40c0..fb4fd3d 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -42,6 +42,10 @@
#include osl/file.hxx
#include unotools/pathoptions.hxx
+#include com/sun/star/awt/KeyModifier.hpp
+#include svtools/acceleratorexecute.hxx
+#include map
+
using namespace ::com::sun::star;
namespace ooo {
@@ -580,6 +584,130 @@ void SAL_CALL VBAMacroResolver::initialize( const
uno::Sequence uno::Any rAr
OSL_ENSURE( false, VBAMacroResolver::resolveScriptURLtoVBAMacro - not
implemented );
throw uno::RuntimeException();
}
+bool getModifier( char c, sal_uInt16 mod )
+{
+static const char modifiers[] = +^%;
+static const sal_uInt16 KEY_MODS[] = {KEY_SHIFT, KEY_MOD1, KEY_MOD2};
+
+for ( unsigned int i=0; iSAL_N_ELEMENTS(modifiers); ++i )
+{
+if ( c == modifiers[i] )
+{
+mod = mod | KEY_MODS[ i ];
+return true;
+}
+}
+return false;
+}
+
+typedef std::map rtl::OUString, sal_uInt16 MSKeyCodeMap;
+
+sal_uInt16 parseChar( char c ) throw ( uno::RuntimeException )
+{
+sal_uInt16 nVclKey = 0;
+// do we care about locale here for isupper etc. ? probably not
+if ( isalpha( c ) )
+nVclKey |= ( toupper( c ) - 'A' ) + KEY_A;
+else if ( isdigit( c ) )
+nVclKey |= ( c - '0' ) + KEY_0;
+else if ( c == '~' ) // special case
+nVclKey = KEY_RETURN;
+else // I guess we have a problem ( but not sure if locale specific keys
might come into play here )
+throw uno::RuntimeException();
+return nVclKey;
+}
+
+struct KeyCodeEntry
+{
+ const char* sName;
+ sal_uInt16 nCode;
+};
+
+KeyCodeEntry aMSKeyCodesData[] = {
+{ BACKSPACE, KEY_BACKSPACE },
+{ BS, KEY_BACKSPACE },
+{ DELETE, KEY_DELETE },
+{ DEL, KEY_DELETE },
+{ DOWN, KEY_DOWN },
+{ UP, KEY_UP },
+{ LEFT, KEY_LEFT },
+{ RIGHT, KEY_RIGHT },
+{ END, KEY_END },
+{ ESCAPE, KEY_ESCAPE },
+{ ESC, KEY_ESCAPE },
+{ HELP, KEY_HELP },
+{ HOME, KEY_HOME },
+{ PGDN, KEY_PAGEDOWN },
+{ PGUP, KEY_PAGEUP },
+{ INSERT, KEY_INSERT },
+{ F1, KEY_F1 },
+{ F2, KEY_F2 },
+{ F3, KEY_F3 },
+{ F4, KEY_F4 },
+{ F5, KEY_F5 },
+{ F6, KEY_F6 },
+{ F7, KEY_F7 },
+{ F8, KEY_F8 },
+{ F9, KEY_F1 },
+{ F10, KEY_F10 },
+{ F11, KEY_F11 },
+{ F12, KEY_F12 },
+{ F13, KEY_F13 },
+{ F14, KEY_F14 },
+{ F15, KEY_F15 },
+};
+
+awt::KeyEvent parseKeyEvent( const ::rtl::OUString Key ) throw (
uno::RuntimeException )
+{
+static MSKeyCodeMap msKeyCodes;
+if ( msKeyCodes.empty() )
+{
+for ( unsigned int i = 0; i SAL_N_ELEMENTS( aMSKeyCodesData ); ++i )
+{
+msKeyCodes[ rtl::OUString::createFromAscii( aMSKeyCodesData[ i
].sName ) ] = aMSKeyCodesData[ i ].nCode;
+}
+}
+rtl::OUString sKeyCode;
[Libreoffice-commits] .: toolkit/source
toolkit/source/controls/unocontrolmodel.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d0644be54ddc581d98c2c4cab842b71756104c21 Author: Caolán McNamara caol...@redhat.com Date: Mon Mar 5 15:22:55 2012 + fix dbgutil build diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 53c5af0..ac7f3ed 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -703,7 +703,7 @@ void UnoControlModel::write( const ::com::sun::star::uno::Reference ::com::sun: ::rtl::OUString sTypeName( rType.getTypeName() ); sMessage += ::rtl::OString( sTypeName.getStr(), sTypeName.getLength(), RTL_TEXTENCODING_ASCII_US ); sMessage += '.\n(Currently handling property '; -::rtl::OUString sPropertyName( GetPropertyName( pProp-GetId() ) ); +::rtl::OUString sPropertyName( GetPropertyName( *it ) ); sMessage += ::rtl::OString( sPropertyName.getStr(), sPropertyName.getLength(), osl_getThreadTextEncoding() ); sMessage += '.); OSL_FAIL( sMessage.getStr() ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.1.2'
Tag 'libreoffice-3.5.1.2' created by Petr Mladek pmla...@suse.cz at 2012-03-05 16:04 -0800 Tag 3.5.1.2 (3.5.1-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPVOQoAAoJEPQ0oe+v7q6jkd0P/2s/p3buC/OFuXZiPzOM+CeH pQc8jH5Cf8hGMIm+ltb0CjZ0EGZfsDl2SaCluiNm8+s3uI8i6PAR3IUmrSkXFJs3 LT61Dt/4+pZZ5VI241ciav9Fx4i6FZIDxKpFvtMxm7+GVx3Nfrp2GImYvcSYxxEg yPh+Gfcq24dzhjkdraEyV7F3MLCBEmx13t6bqpd2WDHKKcqFCUjQU0a6xAeLnhzx 0BKWBC5CwLcL4VzhlE21pwJIws70wz85FUxOm0AYB6a8WWpdqalmxJRZRu6WAxt+ mSjXGCZITkiunODDSBrYiiVa4OyzUOXZgwmNJKyG9MWkV+ZhwVACP4n3z7R1rn1S E4MLxjKd3lLdGGeKcG2eoR6RlUJINQaHIPvbEVHX2/IPGCSQqv+tsvr9dN05dW6u w8pEeI8hWJbNf2LeN2AFSA4vIEvfkusEtveW/I+Y6CyKF56dnIjAxWlx9SVlRyl+ e0fXvyAOBWEHyoqMavhmxWXy1D9KQ2MNcioukXQE09sHR6Ruc0nJmNL8gd2Y9j0y rWjRpcxVMT4sWqEHkd6O1xGS27DvZTILde5hNeknhTVEnCLz6+mol0z/w9z0Kzyl THLmJqXieDVuaS1xc0/bxtzJRdYH/FUiu32LAeWFyXE/VVRkWAN2cU2mt8ti/C7d QUTo0ZFeXp7+v6TKQ0qm =EQDq -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-865: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'refs/tags/libreoffice-3.5.1.2'
Tag 'libreoffice-3.5.1.2' created by Petr Mladek pmla...@suse.cz at 2012-03-05 16:04 -0800 Tag 3.5.1.2 (3.5.1-rc2) -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.9 (GNU/Linux) iQIcBAABAgAGBQJPVOQoAAoJEPQ0oe+v7q6jdV0QAIYSW47r9LOeY27F6NQ1twk7 gETlUQnBfyXqpoPyO94KDj6OuzCiw/ct4TOTRoWa8kvFJYrzV6ZsvF9z5JQdartZ JO57SNQMQUePoD1gyDF6cBwbmKH5NHDk3SRPlIPXwJer+MHBbMkSinxwgXSJBryy o3CPhRS7ScfwBjmoij2aNleUQMECO+iGdXs2FcQaptoixv/z6QcRaEVDmpLK3Y8/ PBmo7DETr8L7f9/nOstqwpObH+DUlXfzKIDmQ9ZQgu8/5ppk3DSnA8h3StTHAYuQ T8zle3NkiJQOWJZB6frNLBqtpQAIGgA+czSKDYWQY7qL/pCBmnaZZVTmfYUq4Bpk Zh95uvoa8J59XKLTpPQQjqqzbhRssM0PA7KLbmmeeo7ys/ghF1r+vhfIIImjuEsa skb4Bgtmlc60sIxGYCLLifgu27+U2aYOrofi5C3y4cadWahPtjDY+4iU7s1zw7Nc eaxHRUMP4gqi8aE8rRiNDXKP4KrDGocmdDJizmEDPFA5Z1t0cW0K0oT4JWqHaXg8 1Jpm4bQ1jTYElPBMPpwYrjduBtKTSppdnWEOQGH7Ot3yxX8rJlRJ9kFOS+JnaMbV RPxRRNKbH7GgIMDd0O++0kbWGk9bWsJUwCuyGOua/Or0oBMDlA2ynOdXKE3ZY6Zr rqXLFU6JyOscEqyhF8GH =6ztU -END PGP SIGNATURE- Changes since libreoffice-3-5-branch-point-30: --- 0 files changed --- ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 106 +-
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 18 ++-
2 files changed, 58 insertions(+), 66 deletions(-)
New commits:
commit d4fd86e3a48defbff29bfbabfbf0d2c5d95d39f5
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Mar 5 17:25:41 2012 +0100
n#693238, n#747471: create TableManager for inside shapes
When a texbox is contained inside a table cell... we were running into
some troubles when creating the table: the reference to the paragraphs
inside the textbox were passed to the TableManager. This was leading to
missing references when converting to a table because the paragraph
references within the textbox were dropped.
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 9047784..066416e 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1524,6 +1524,9 @@ void DomainMapper_Impl::PushShapeContext( const
uno::Reference drawing::XShape
{
xProps-setPropertyValue( rPropNameSupplier.GetName(
PROP_ANCHOR_TYPE ), bIsGraphic ? uno::makeAny(
text::TextContentAnchorType_AS_CHARACTER ) : uno::makeAny(
text::TextContentAnchorType_AT_PARAGRAPH ) );
}
+
+appendTableManager( );
+getTableManager().startLevel();
}
catch ( const uno::Exception e )
{
@@ -1537,6 +1540,9 @@ void DomainMapper_Impl::PopShapeContext()
{
if ( m_aAnchoredStack.size() 0 )
{
+getTableManager().endLevel();
+popTableManager();
+
// For OLE object replacement shape, the text append context was
already removed
// or the OLE object couldn't be inserted.
if ( !m_aAnchoredStack.top().bToRemove )
commit 4a0e2d6dc8ba3208f38e3a814ed806384a86ee9a
Author: Cédric Bosdonnat cedric.bosdonnat@free.fr
Date: Mon Mar 5 10:50:27 2012 +0100
n#747471, n#693238: Textboxes import is a mess with OLE objects inside
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8e5b9ea..9047784 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -191,8 +191,6 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bIsFirstSection( true ),
m_bIsColumnBreakDeferred( false ),
m_bIsPageBreakDeferred( false ),
-m_bIsInShape( false ),
-m_bShapeContextAdded( false ),
m_pLastSectionContext( ),
m_nCurrentTabStopIndex( 0 ),
m_sCurrentParaStyleId(),
@@ -584,37 +582,6 @@ void DomainMapper_Impl::clearDeferredBreaks()
m_bIsPageBreakDeferred = false;
}
-bool lcl_removeShape( const uno::Reference text::XTextDocument rDoc,
const uno::Reference drawing::XShape rShape, TextContentStack
rAnchoredStack,TextAppendStack rTextAppendStack )
-{
-bool bRet = false;
-// probably unecessary but just double check that indeed the top of
Anchored stack
-// does contain the shape we intend to remove
-uno::Reference drawing::XShape xAnchorShape(rAnchoredStack.top( ),
uno::UNO_QUERY );
-if ( xAnchorShape == rShape )
-{
-// because we only want to process the embedded object and not the
associated
-// shape we need to get rid of that shape from the Draw page and
Anchored and
-// Append stacks so it wont be processed further
-try
-{
-uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(rDoc,
uno::UNO_QUERY_THROW);
-uno::Referencedrawing::XDrawPage xDrawPage =
xDrawPageSupplier-getDrawPage();
-if ( xDrawPage.is() )
-{
-xDrawPage-remove( rShape );
-}
-rAnchoredStack.pop();
-rTextAppendStack.pop();
-bRet = true;
-}
-catch( uno::Exception )
-{
-}
-}
-return bRet;
-}
-
-
void lcl_MoveBorderPropertiesToFrame(uno::Sequencebeans::PropertyValue
rFrameProperties,
uno::Referencetext::XTextRange xStartTextRange,
@@ -1049,21 +1016,6 @@ void DomainMapper_Impl::finishParagraph( PropertyMapPtr
pPropertyMap )
xTextAppend-finishParagraph( aProperties );
getTableManager( ).handle(xTextRange);
-// Set the anchor of the objects to the created paragraph
-while ( m_aAnchoredStack.size( ) 0 !m_bIsInShape )
-{
-uno::Reference text::XTextContent xObj =
m_aAnchoredStack.top( );
-try
-{
-xObj-attach( xTextRange );
-}
-catch ( uno::RuntimeException )
-{
-// this is normal: the shape is already attached
-}
-
[Libreoffice-commits] .: chart2/source
chart2/source/view/axes/VCartesianAxis.cxx | 36 +++--
1 file changed, 9 insertions(+), 27 deletions(-)
New commits:
commit a1be31fd8bf830a4f5961e690bcffd050782e210
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Sun Mar 4 20:45:45 2012 +0100
fdo#44832: Follow-up fix for axis labels for complex categories
Don't add special handling for second and following
categories.
[From Markus's patch email to the list, edited by tml]
This patch is not obvious and I'm not sure that it will not introduce
another regression. I don't fully understand why we need to add
special handling for labels of second and following categories.
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index a6547ef..8291efb 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1333,20 +1333,15 @@ void VCartesianAxis::doStaggeringOfLabels( const
AxisLabelProperties rAxisLabel
for( sal_Int32 nTextLevel=0; nTextLevelnTextLevelCount; nTextLevel++ )
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr TickIter apTickIter = createLabelTickIterator(
nTextLevel );
+::std::auto_ptr TickIter apTickIter =
createLabelTickIterator( nTextLevel );
SAL_WNODEPRECATED_DECLARATIONS_POP
-if(apTickIter.get())
-{
-double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
-if( nTextLevel0 )
+if(apTickIter.get())
{
-lcl_shiftLables( *apTickIter.get(),
aCummulatedLabelsDistance );
-fRotationAngleDegree = 0.0;
+double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
+aCummulatedLabelsDistance += lcl_getLabelsDistance(
*apTickIter.get()
+, pTickFactory2D-getDistanceAxisTickToText(
m_aAxisProperties )
+, fRotationAngleDegree );
}
-aCummulatedLabelsDistance += lcl_getLabelsDistance(
*apTickIter.get()
-, pTickFactory2D-getDistanceAxisTickToText(
m_aAxisProperties )
-, fRotationAngleDegree );
-}
}
}
else if( rAxisLabelProperties.getIsStaggered() )
@@ -1408,18 +1403,9 @@ void VCartesianAxis::createLabels()
AxisLabelProperties aComplexProps(m_aAxisLabelProperties);
if( m_aAxisProperties.m_bComplexCategories )
{
-if( nTextLevel==0 )
-{
-aComplexProps.bLineBreakAllowed = true;
-aComplexProps.bOverlapAllowed =
!::rtl::math::approxEqual( aComplexProps.fRotationAngleDegree, 0.0 );
-}
-else
-{
-aComplexProps.bOverlapAllowed = true;
-aComplexProps.bRhythmIsFix = true;
-aComplexProps.nRhythm = 1;
-aComplexProps.fRotationAngleDegree = 0.0;
-}
+aComplexProps.bLineBreakAllowed = true;
+aComplexProps.bOverlapAllowed = !::rtl::math::approxEqual(
aComplexProps.fRotationAngleDegree, 0.0 );
+
}
AxisLabelProperties rAxisLabelProperties =
m_aAxisProperties.m_bComplexCategories ? aComplexProps : m_aAxisLabelProperties;
while( !createTextShapes( m_xTextTarget, *apTickIter.get(),
rAxisLabelProperties, pTickFactory2D, nScreenDistanceBetweenTicks ) )
@@ -1515,8 +1501,6 @@ void VCartesianAxis::updatePositions()
,static_castsal_Int32(aTickScreenPos2D.getY()));
double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
-if( nDepth0 )
-fRotationAngleDegree = 0.0;
// #i78696# use mathematically correct rotation now
const double fRotationAnglePi(fRotationAngleDegree * (F_PI
/ -180.0));
@@ -1615,8 +1599,6 @@ void VCartesianAxis::createShapes()
if( apTickIter.get() )
{
double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
-if( nTextLevel0 )
-fRotationAngleDegree = 0.0;
B2DVector aLabelsDistance( lcl_getLabelsDistance(
*apTickIter.get(), pTickFactory2D-getDistanceAxisTickToText(
m_aAxisProperties, false ), fRotationAngleDegree ) );
sal_Int32 nCurrentLength =
static_castsal_Int32(aLabelsDistance.getLength());
aTickmarkPropertiesList.push_back(
m_aAxisProperties.makeTickmarkPropertiesForComplexCategories( nOffset +
nCurrentLength, 0,
[Libreoffice-commits] .: comphelper/inc comphelper/source
comphelper/inc/comphelper/oslfile2streamwrap.hxx|4
comphelper/source/container/container.cxx | 31 ++
comphelper/source/container/enumhelper.cxx |4
comphelper/source/eventattachermgr/eventattachermgr.cxx | 81 +++-
comphelper/source/property/propagg.cxx | 13 +-
5 files changed, 64 insertions(+), 69 deletions(-)
New commits:
commit 8907a41bf8370446a1cc46c72b2841e5e3588806
Author: Tom Thorogood t...@tomthorogood.com
Date: Tue Feb 28 00:38:23 2012 -0500
Translate german comments in core/comphelper
diff --git a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
index 754be72..64ebca6 100644
--- a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
+++ b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
@@ -42,7 +42,7 @@ namespace comphelper
//==
// FmUnoIOStream,
-// stream zum schreiben un lesen von Daten, basieren auf File
+// Stream to read and write from data read from a file
//==
class COMPHELPER_DLLPUBLIC OSLInputStreamWrapper : public
::cppu::WeakImplHelper1stario::XInputStream
{
@@ -63,7 +63,7 @@ public:
//==
// FmUnoOutStream,
-// Datensenke fuer Files
+// sync data for the files
//==
class OSLOutputStreamWrapper : public
::cppu::WeakImplHelper1stario::XOutputStream
{
diff --git a/comphelper/source/container/container.cxx
b/comphelper/source/container/container.cxx
index 7bf2f8f..d3012c2 100644
--- a/comphelper/source/container/container.cxx
+++ b/comphelper/source/container/container.cxx
@@ -51,9 +51,9 @@ IndexAccessIterator::~IndexAccessIterator() {}
::com::sun::star::uno::Reference ::com::sun::star::uno::XInterface
IndexAccessIterator::Next()
{
sal_Bool bCheckingStartingPoint = !m_xCurrentObject.is();
-// ist die aktuelle Node der Anfangspunkt ?
+// Is the current node the starting point?
sal_Bool bAlreadyCheckedCurrent = m_xCurrentObject.is();
-// habe ich die aktuelle Node schon mal mittels ShouldHandleElement
testen ?
+// Have I already tested the current node through ShouldHandleElement?
if (!m_xCurrentObject.is())
m_xCurrentObject = m_xStartingPoint;
@@ -62,7 +62,7 @@ IndexAccessIterator::~IndexAccessIterator() {}
sal_Bool bFoundSomething = sal_False;
while (!bFoundSomething bHasMoreToSearch)
{
-// pre-order-traversierung
+// Priming loop
if (!bAlreadyCheckedCurrent ShouldHandleElement(xSearchLoop))
{
m_xCurrentObject = xSearchLoop;
@@ -70,10 +70,10 @@ IndexAccessIterator::~IndexAccessIterator() {}
}
else
{
-// zuerst absteigen, wenn moeglich
+// First, check to see if there's a match below
::com::sun::star::uno::Reference
::com::sun::star::container::XIndexAccess xContainerAccess(xSearchLoop,
::com::sun::star::uno::UNO_QUERY);
if (xContainerAccess.is() xContainerAccess-getCount()
ShouldStepInto(xContainerAccess))
-{ // zum ersten Child
+{
::com::sun::star::uno::Any
aElement(xContainerAccess-getByIndex(0));
xSearchLoop = *(::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface*)aElement.getValue();
bCheckingStartingPoint = sal_False;
@@ -81,10 +81,9 @@ IndexAccessIterator::~IndexAccessIterator() {}
m_arrChildIndizies.push_back((sal_Int32)0);
}
else
-{
-// dann nach oben und nach rechts, wenn moeglich
+{ // otherwise, look above and to the right, if possible
while (m_arrChildIndizies.size() 0)
-{ // (mein Stack ist nich leer, also kann ich noch nach oben
gehen)
+{ // If the list isn't empty and there's nothing above
::com::sun::star::uno::Reference
::com::sun::star::container::XChild xChild(xSearchLoop,
::com::sun::star::uno::UNO_QUERY);
OSL_ENSURE(xChild.is(), IndexAccessIterator::Next : a
content has no approriate interface !);
@@ -92,36 +91,35 @@ IndexAccessIterator::~IndexAccessIterator() {}
xContainerAccess = ::com::sun::star::uno::Reference
::com::sun::star::container::XIndexAccess(xParent,
::com::sun::star::uno::UNO_QUERY);
OSL_ENSURE(xContainerAccess.is(),
IndexAccessIterator::Next : a content has an invalid parent !);
-// den Index, den SearchLoop in diesem Parent hatte, von
meinem 'Stack'
+// Update the search loop index
sal_Int32 nOldSearchChildIndex =
[Libreoffice-commits] .: basic/inc basic/source unusedcode.easy
basic/inc/basic/vbahelper.hxx | 16 -
basic/source/basmgr/vbahelper.cxx | 19 ---
basic/source/inc/namecont.hxx |5 --
basic/source/uno/namecont.cxx | 64 --
unusedcode.easy |2 -
5 files changed, 106 deletions(-)
New commits:
commit 99ff0ab0b2f4f6b8718b4dfa1bfc2c598ac25c4c
Author: Elton Chung el...@layerjet.com
Date: Mon Mar 5 23:30:31 2012 +0800
Remove unused code from basic
diff --git a/basic/inc/basic/vbahelper.hxx b/basic/inc/basic/vbahelper.hxx
index 4655897..8530c95 100644
--- a/basic/inc/basic/vbahelper.hxx
+++ b/basic/inc/basic/vbahelper.hxx
@@ -100,22 +100,6 @@ BASIC_DLLPUBLIC void registerCurrentDirectory(
//
-/** Returns the working directory of the application the passed document
-belongs to.
-
-@param rxModel
-A document model determining the type of the application whose working
-directory is querried.
-
-@return
-The working directory of the specified application, or an empty string
-on error (e.g. if the passed document reference is empty).
- */
-BASIC_DLLPUBLIC ::rtl::OUString getCurrentDirectory(
-const ::com::sun::star::uno::Reference ::com::sun::star::frame::XModel
rxModel );
-
-//
-
} // namespace vba
} // namespace basic
diff --git a/basic/source/basmgr/vbahelper.cxx
b/basic/source/basmgr/vbahelper.cxx
index 16e7222..b711a96 100644
--- a/basic/source/basmgr/vbahelper.cxx
+++ b/basic/source/basmgr/vbahelper.cxx
@@ -235,25 +235,6 @@ void registerCurrentDirectory( const uno::Reference
frame::XModel rxModel, c
//
-::rtl::OUString getCurrentDirectory( const uno::Reference frame::XModel
rxModel )
-{
-::rtl::OUString aPath;
-CurrDirPool rPool = StaticCurrDirPool::get();
-::osl::MutexGuard aGuard( rPool.maMutex );
-try
-{
-uno::Reference frame::XModuleManager xModuleManager(
lclCreateModuleManager(), uno::UNO_SET_THROW );
-::rtl::OUString aIdentifier = xModuleManager-identify( rxModel );
-aPath = rPool.maCurrDirs[ aIdentifier ];
-}
-catch(const uno::Exception )
-{
-}
-return aPath;
-}
-
-//
-
} // namespace vba
} // namespace basic
diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx
index 8f585b5..833fc81 100644
--- a/basic/source/inc/namecont.hxx
+++ b/basic/source/inc/namecont.hxx
@@ -757,11 +757,6 @@ public:
ScriptExtensionIterator( void );
rtl::OUString nextBasicOrDialogLibrary( bool rbPureDialogLib );
-private:
-com::sun::star::uno::Reference com::sun::star::deployment::XPackage
implGetScriptPackageFromPackage
-( const com::sun::star::uno::Reference
com::sun::star::deployment::XPackage xPackage,
- bool rbPureDialogLib );
-
protected:
com::sun::star::uno::Reference com::sun::star::deployment::XPackage
implGetNextUserScriptPackage( bool rbPureDialogLib );
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index fbc52ea..f6544b5 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -3358,70 +3358,6 @@ Reference deployment::XPackage
ScriptSubPackageIterator::implDetectScriptPack
return xScriptPackage;
}
-Reference deployment::XPackage
ScriptExtensionIterator::implGetScriptPackageFromPackage
-( const Reference deployment::XPackage xPackage, bool rbPureDialogLib )
-{
-rbPureDialogLib = false;
-
-Reference deployment::XPackage xScriptPackage;
-if( !xPackage.is() )
-return xScriptPackage;
-
-// Check if parent package is registered
-beans::Optional beans::Ambiguoussal_Bool option(
xPackage-isRegistered
-( Referencetask::XAbortChannel(),
Referenceucb::XCommandEnvironment() ) );
-bool bRegistered = false;
-if( option.IsPresent )
-{
-beans::Ambiguoussal_Bool const reg = option.Value;
-if( !reg.IsAmbiguous reg.Value )
-bRegistered = true;
-}
-if( bRegistered )
-{
-if( xPackage-isBundle() )
-{
-Sequence Reference deployment::XPackage aPkgSeq =
xPackage-getBundle
-( Referencetask::XAbortChannel(),
Referenceucb::XCommandEnvironment() );
-sal_Int32 nPkgCount = aPkgSeq.getLength();
-const Reference deployment::XPackage * pSeq =
aPkgSeq.getConstArray();
-for( sal_Int32 iPkg = 0 ; iPkg nPkgCount ; ++iPkg )
-{
-const Reference deployment::XPackage xSubPkg = pSeq[ iPkg ];
-const Reference deployment::XPackageTypeInfo
xPackageTypeInfo = xSubPkg-getPackageType();
-rtl::OUString
[Libreoffice-commits] .: 3 commits - bootstrap solenv/bin solenv/gbuild
bootstrap |6 --
solenv/bin/concat-deps.c|2 ++
solenv/gbuild/platform/com_GCC_class.mk |5 ++---
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit be5567d9e36ad40deb3e5c6ed219265cddc944c0
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 20:50:56 2012 +0200
Revert Workaround for weird gbuild looping problem with Clang for iOS
The root cause for the problem was in solenv/bin/concat-deps.c, has
been fixed now.
This reverts commit af9618b29f186c3991d9225cc50b55dc78612f27.
diff --git a/solenv/gbuild/platform/com_GCC_class.mk
b/solenv/gbuild/platform/com_GCC_class.mk
index 78c1a7e..b8de73e 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -55,11 +55,10 @@ $(call gb_Helper_abbreviate_dirs,\
$(if $(WARNINGS_NOT_ERRORS),,$(gb_CXXFLAGS_WERROR)) \
-c $(3) \
-o $(1) \
- $(if $(filter IOS,$(OS)),,-MMD -MT $(1) \
- -MP -MF $(4)) \
+ -MMD -MT $(1) \
+ -MP -MF $(4) \
-I$(dir $(3)) \
$(INCLUDE_STL) $(INCLUDE))
- $(if $(filter IOS,$(OS)),@echo $(1) : $(3) $(4))
endef
define gb_SrsPartTarget__command_dep
commit 921902ead77b7111a84678898e92fbdaf9e6f496
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 20:40:22 2012 +0200
Handle consecutive slashes before ..
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index a667e0a..28ac2ed 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -692,6 +692,8 @@ static void _cancel_relative(char* base, char** ref_cursor,
char** ref_cursor_ou
do
{
cursor += 3;
+while(cursor_out base cursor_out[-1] == '/')
+cursor_out--;
while(cursor_out base *--cursor_out != '/');
}
while(cursor + 3 end !memcmp(cursor, /../, 4));
commit 94d553b2fbff217861f150ba0583ea1dca35b30e
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 20:38:29 2012 +0200
Must properly quote also the vars in config_build.mk when sourcing it
diff --git a/bootstrap b/bootstrap
index 313c2a9..3d1bc88 100755
--- a/bootstrap
+++ b/bootstrap
@@ -2,10 +2,12 @@
if test -z ${SRC_ROOT}; then
if test -f ./config_build.mk ; then
-. ./config_build.mk
+sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_build.mk
config_build.mk.sh
+. ./config_build.mk.sh
+rm config_build.mk.sh
else
if test -f ./config_host.mk ; then
-sed -e 's/^\(export .*=\)\(.*\)$/\1\2/' config_host.mk
config_host.mk.sh
+sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$/\1\2/' config_host.mk
config_host.mk.sh
. ./config_host.mk.sh
rm config_host.mk.sh
fi
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: filter/inc filter/source oox/source vbahelper/source
filter/inc/filter/msfilter/msvbahelper.hxx|2
filter/source/msfilter/msvbahelper.cxx| 50 +-
oox/source/ole/vbamodule.cxx | 36 +++
vbahelper/source/vbahelper/vbaapplicationbase.cxx | 28
4 files changed, 87 insertions(+), 29 deletions(-)
New commits:
commit 14620c3b33cf0315a9b746a0a2418b78d6154821
Author: Noel Power noel.po...@novell.com
Date: Mon Mar 5 20:14:13 2012 +
support import of key shortcut for macro ( Excel only )
diff --git a/filter/inc/filter/msfilter/msvbahelper.hxx
b/filter/inc/filter/msfilter/msvbahelper.hxx
index 99b20c1..e7e6533 100644
--- a/filter/inc/filter/msfilter/msvbahelper.hxx
+++ b/filter/inc/filter/msfilter/msvbahelper.hxx
@@ -34,6 +34,7 @@
#include com/sun/star/lang/XServiceInfo.hpp
#include com/sun/star/script/vba/XVBAMacroResolver.hpp
#include com/sun/star/awt/KeyEvent.hpp
+#include com/sun/star/frame/XModel.hpp
#include filter/msfilter/msfilterdllapi.h
namespace ooo {
namespace vba {
@@ -56,6 +57,7 @@ MSFILTER_DLLPUBLIC ::rtl::OUString resolveVBAMacro(
SfxObjectShell* pShell, cons
MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell,
const ::rtl::OUString rMacroName, bool bSearchGlobalTemplates = false );
MSFILTER_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const
String sMacroName, com::sun::star::uno::Sequence com::sun::star::uno::Any
aArgs, com::sun::star::uno::Any aRet, const com::sun::star::uno::Any aCaller
);
MSFILTER_DLLPUBLIC ::com::sun::star::awt::KeyEvent parseKeyEvent( const
::rtl::OUString sKey ) throw (::com::sun::star::uno::RuntimeException);
+MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const
::com::sun::star::uno::Reference com::sun::star::frame::XModel rxDoc, const
::com::sun::star::awt::KeyEvent rKeyEvent, const ::rtl::OUString sMacro )
throw (::com::sun::star::uno::RuntimeException);
//
typedef ::cppu::WeakImplHelper3
diff --git a/filter/source/msfilter/msvbahelper.cxx
b/filter/source/msfilter/msvbahelper.cxx
index fb4fd3d..4c7d3f9 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -44,6 +44,8 @@
#include com/sun/star/awt/KeyModifier.hpp
#include svtools/acceleratorexecute.hxx
+#include com/sun/star/ui/XUIConfigurationManagerSupplier.hpp
+#include com/sun/star/ui/XUIConfigurationManager.hpp
#include map
using namespace ::com::sun::star;
@@ -584,6 +586,7 @@ void SAL_CALL VBAMacroResolver::initialize( const
uno::Sequence uno::Any rAr
OSL_ENSURE( false, VBAMacroResolver::resolveScriptURLtoVBAMacro - not
implemented );
throw uno::RuntimeException();
}
+
bool getModifier( char c, sal_uInt16 mod )
{
static const char modifiers[] = +^%;
@@ -607,11 +610,17 @@ sal_uInt16 parseChar( char c ) throw (
uno::RuntimeException )
sal_uInt16 nVclKey = 0;
// do we care about locale here for isupper etc. ? probably not
if ( isalpha( c ) )
+{
nVclKey |= ( toupper( c ) - 'A' ) + KEY_A;
+if ( isupper( c ) )
+nVclKey |= KEY_SHIFT;
+}
else if ( isdigit( c ) )
nVclKey |= ( c - '0' ) + KEY_0;
else if ( c == '~' ) // special case
nVclKey = KEY_RETURN;
+else if ( c == ' ' ) // special case
+nVclKey = KEY_SPACE;
else // I guess we have a problem ( but not sure if locale specific keys
might come into play here )
throw uno::RuntimeException();
return nVclKey;
@@ -640,6 +649,9 @@ KeyCodeEntry aMSKeyCodesData[] = {
{ PGDN, KEY_PAGEDOWN },
{ PGUP, KEY_PAGEUP },
{ INSERT, KEY_INSERT },
+{ SCROLLLOCK, KEY_SCROLLLOCK },
+{ NUMLOCK, KEY_NUMLOCK },
+{ TAB, KEY_TAB },
{ F1, KEY_F1 },
{ F2, KEY_F2 },
{ F3, KEY_F3 },
@@ -675,7 +687,7 @@ awt::KeyEvent parseKeyEvent( const ::rtl::OUString Key )
throw ( uno::RuntimeEx
{
if ( ! getModifier( Key[ i ], nVclKey ) )
{
-sKeyCode = Key.copy( i ).trim();
+sKeyCode = Key.copy( i );
break;
}
}
@@ -709,6 +721,42 @@ awt::KeyEvent parseKeyEvent( const ::rtl::OUString Key )
throw ( uno::RuntimeEx
return aKeyEvent;
}
+void applyShortCutKeyBinding ( const uno::Reference frame::XModel rxModel,
const awt::KeyEvent rKeyEvent, const ::rtl::OUString rMacroName ) throw
(uno::RuntimeException)
+{
+rtl::OUString MacroName( rMacroName );
+if ( !MacroName.isEmpty() )
+{
+::rtl::OUString sSeparator(RTL_CONSTASCII_USTRINGPARAM(/));
+::rtl::OUString sMacroSeparator(RTL_CONSTASCII_USTRINGPARAM(!));
+::rtl::OUString aMacroName = MacroName.trim();
+if (0 == aMacroName.indexOf('!'))
+MacroName = aMacroName.copy(1).trim();
+SfxObjectShell* pShell = NULL;
+if ( rxModel.is() )
+{
+uno::Reference lang::XUnoTunnel xObjShellTunnel(
[Libreoffice-commits] .: 4 commits - basic/Library_sb.mk basic/Module_basic.mk basic/source dbaccess/source filter/source Makefile RepositoryFixes.mk sd/source sfx2/source sw/source
Makefile|6
RepositoryFixes.mk |1
basic/Library_sb.mk | 15 +
basic/Module_basic.mk |2
basic/source/runtime/methods.cxx| 196 +++-
basic/source/runtime/methods1.cxx | 80
basic/source/sbx/sbxarray.cxx |2
basic/source/sbx/sbxdbl.cxx |4
basic/source/sbx/sbxscan.cxx|2
basic/source/sbx/sbxstr.cxx |4
basic/source/sbx/sbxvalue.cxx | 13 +
basic/source/sbx/sbxvar.cxx |8
dbaccess/source/core/dataaccess/databasecontext.cxx | 11 +
filter/source/msfilter/msvbahelper.cxx | 32 +++
filter/source/msfilter/svxmsbas2.cxx|3
sd/source/ui/slideshow/slideshowimpl.cxx|4
sd/source/ui/view/ViewShellImplementation.cxx |4
sd/source/ui/view/drviews2.cxx | 12 -
sd/source/ui/view/drviews3.cxx |6
sd/source/ui/view/drviews9.cxx | 54 +++--
sd/source/ui/view/drviewsb.cxx |4
sd/source/ui/view/viewshe3.cxx |6
sfx2/source/doc/objstor.cxx |4
sw/source/core/doc/doc.cxx |2
sw/source/core/unocore/unocoll.cxx | 13 +
sw/source/filter/html/htmlbas.cxx |2
sw/source/filter/ww8/ww8par.cxx |4
sw/source/ui/app/docsh.cxx |2
sw/source/ui/app/docsh2.cxx |2
sw/source/ui/shells/frmsh.cxx |2
30 files changed, 339 insertions(+), 161 deletions(-)
New commits:
commit b344c30ab49b6faf8a24be42bdfcf4e946a861cd
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 21:41:31 2012 +0200
Sprinkle more DISABLE_SCRIPTING ifdefs
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index efcf67f..28ce80f 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -120,6 +120,8 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
#undef GradientSyle_RECT
#endif
+#ifndef DISABLE_SCRIPTING
+
// from source/classes/sbxmod.cxx
Reference XModel getDocumentModel( StarBASIC* );
@@ -143,20 +145,7 @@ static void FilterWhiteSpace( String rStr )
rStr = aRet.makeStringAndClear();
}
-static long GetDayDiff( const Date rDate )
-{
-Date aRefDate( 1,1,1900 );
-long nDiffDays;
-if ( aRefDate rDate )
-{
-nDiffDays = (long)(aRefDate - rDate);
-nDiffDays *= -1;
-}
-else
-nDiffDays = (long)(rDate - aRefDate);
-nDiffDays += 2; // adjustment VisualBasic: 1.Jan.1900 == 2
-return nDiffDays;
-}
+static long GetDayDiff( const Date rDate );
static const CharClass GetCharClass( void )
{
@@ -1761,68 +1750,7 @@ sal_Int16 implGetDateMonth( double aDate )
return nRet;
}
-sal_Int16 implGetDateYear( double aDate )
-{
-Date aRefDate( 1,1,1900 );
-long nDays = (long) aDate;
-nDays -= 2; // standardize: 1.1.1900 = 0.0
-aRefDate += nDays;
-sal_Int16 nRet = (sal_Int16)( aRefDate.GetYear() );
-return nRet;
-}
-
-sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay,
double rdRet )
-{
-if ( nYear 30 SbiRuntime::isVBAEnabled() )
-nYear += 2000;
-else if ( nYear 100 )
-nYear += 1900;
-Date aCurDate( nDay, nMonth, nYear );
-if ((nYear 100 || nYear ) )
-{
-StarBASIC::Error( SbERR_BAD_ARGUMENT );
-return sal_False;
-}
-if ( !SbiRuntime::isVBAEnabled() )
-{
-if ( (nMonth 1 || nMonth 12 )||
-(nDay 1 || nDay 31 ) )
-{
-StarBASIC::Error( SbERR_BAD_ARGUMENT );
-return sal_False;
-}
-}
-else
-{
-// grab the year month
-aCurDate = Date( 1, (( nMonth % 12 ) 0 ) ? ( nMonth % 12 ) : 12 + (
nMonth % 12 ), nYear );
-
-// adjust year based on month value
-// e.g. 2000, 0, xx = 1999, 12, xx ( or December of the previous year )
-// 2000, 13, xx = 2001, 1, xx ( or January of the following year )
-if( ( nMonth 1 ) || ( nMonth 12 ) )
-{
-// inacurrate around leap year, don't use days to calculate,
-// just modify the months directory
-sal_Int16 nYearAdj = ( nMonth /12 ); // default to positive months
inputed
-if ( nMonth =0 )
-nYearAdj = ( ( nMonth -12 ) / 12 );
-aCurDate.SetYear( aCurDate.GetYear() + nYearAdj );
-}
-
-// adjust day value,
-// e.g. 2000, 2, 0 = 2000, 1, 31 or the last day of the previous month
-// 2000, 1, 32 =
[Libreoffice-commits] .: 2 commits - sfx2/source
sfx2/source/dialog/dinfdlg.cxx | 245 +++--
1 file changed, 116 insertions(+), 129 deletions(-)
New commits:
commit 8a997fd7e0e034e27219ce67d73f8195e95a4716
Author: William Gathoye will...@gathoye.be
Date: Mon Mar 5 20:50:56 2012 +
Fix indentation
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 874e455..2b4e06d 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -26,7 +26,6 @@
*
/
-
#include tools/urlobj.hxx
#include vcl/msgbox.hxx
#include svl/eitem.hxx
@@ -85,7 +84,6 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
-
struct CustomProperty
{
::rtl::OUString m_sName;
@@ -99,7 +97,6 @@ struct CustomProperty
{ return m_sName.equals( rProp.m_sName ) m_aValue == rProp.m_aValue; }
};
-
static
bool operator==(const util::DateTime i_rLeft, const util::DateTime i_rRight)
{
@@ -113,7 +110,6 @@ bool operator==(const util::DateTime i_rLeft, const
util::DateTime i_rRight)
}
// STATIC DATA ---
-
TYPEINIT1_AUTOFACTORY(SfxDocumentInfoItem, SfxStringItem);
const sal_uInt16 HI_NAME = 1;
@@ -121,7 +117,7 @@ const sal_uInt16 HI_TYPE = 2;
const sal_uInt16 HI_VALUE = 3;
const sal_uInt16 HI_ACTION = 4;
-static const char DOCUMENT_SIGNATURE_MENU_CMD[] = Signature;
+static const char DOCUMENT_SIGNATURE_MENU_CMD[] = Signature;
//
String CreateSizeText( sal_uIntPtr nSize, sal_Bool bExtraBytes = sal_True,
sal_Bool bSmartExtraBytes = sal_False );
@@ -326,28 +322,23 @@ SfxDocumentInfoItem::SfxDocumentInfoItem( const
SfxDocumentInfoItem rItem )
}
//
-
SfxDocumentInfoItem::~SfxDocumentInfoItem()
{
ClearCustomProperties();
}
//
-
SfxPoolItem* SfxDocumentInfoItem::Clone( SfxItemPool * ) const
{
return new SfxDocumentInfoItem( *this );
}
//
-
int SfxDocumentInfoItem::operator==( const SfxPoolItem rItem) const
{
-if (!(rItem.Type() == Type() SfxStringItem::operator==(rItem))) {
+if (!(rItem.Type() == Type() SfxStringItem::operator==(rItem)))
return false;
-}
-const SfxDocumentInfoItem rInfoItem(
-static_castconst SfxDocumentInfoItem(rItem));
+const SfxDocumentInfoItem rInfoItem(static_castconst
SfxDocumentInfoItem(rItem));
return
m_AutoloadDelay== rInfoItem.m_AutoloadDelay
@@ -372,7 +363,6 @@ int SfxDocumentInfoItem::operator==( const SfxPoolItem
rItem) const
}
//
-
void SfxDocumentInfoItem::resetUserData(const ::rtl::OUString i_rAuthor)
{
setAuthor(i_rAuthor);
@@ -389,7 +379,6 @@ void SfxDocumentInfoItem::resetUserData(const
::rtl::OUString i_rAuthor)
}
//
-
void SfxDocumentInfoItem::UpdateDocumentInfo(
const uno::Referencedocument::XDocumentProperties i_xDocProps,
bool i_bDoNotUpdateUserDefined) const
@@ -462,7 +451,6 @@ void SfxDocumentInfoItem::UpdateDocumentInfo(
}
//
-
sal_Bool SfxDocumentInfoItem::IsDeleteUserData() const
{
return m_bDeleteUserData;
@@ -639,7 +627,6 @@ bool SfxDocumentInfoItem::PutValue( const Any rVal,
sal_uInt8 nMemberId )
}
//
-
SfxDocumentDescPage::SfxDocumentDescPage( Window * pParent, const SfxItemSet
rItemSet ) :
SfxTabPage( pParent, SfxResId( TP_DOCINFODESC ), rItemSet ),
@@ -660,14 +647,12 @@ SfxDocumentDescPage::SfxDocumentDescPage( Window *
pParent, const SfxItemSet rI
}
//
-
SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet
rItemSet)
{
return new SfxDocumentDescPage(pParent, rItemSet);
}
//
-
sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet rSet)
{
// Test whether a change is present
@@ -675,7 +660,7 @@ sal_Bool SfxDocumentDescPage::FillItemSet(SfxItemSet rSet)
const sal_Bool bThemeMod = aThemaEd.IsModified();
const sal_Bool bKeywordsMod = aKeywordsEd.IsModified();
const sal_Bool bCommentMod = aCommentEd.IsModified();
-if( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) )
+if ( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) )
{
return
[Libreoffice-commits] .: configure.in
configure.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0be7432f3b5210808438ab2ab2bae09a81b06ae8 Author: Michael Meeks michael.me...@suse.com Date: Mon Mar 5 20:56:51 2012 + fix icecream check to not break on SUSE diff --git a/configure.in b/configure.in index f0ac6a0..49ce97f 100644 --- a/configure.in +++ b/configure.in @@ -2179,7 +2179,7 @@ GCC_HOME_SET=true AC_MSG_CHECKING([gcc home]) if test -z $with_gcc_home; then if test $enable_icecream = yes ; then -if test -d /usr/lib/icecc/ ; then +if test -d /usr/lib/icecc/bin ; then GCC_HOME=/usr/lib/icecc/ else GCC_HOME=/opt/icecream/ ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basic/inc basic/Library_sb.mk basic/source
basic/Library_sb.mk |1
basic/inc/basic/sbxmstrm.hxx | 53 --
basic/source/sbx/sbxmstrm.cxx | 40 ---
3 files changed, 94 deletions(-)
New commits:
commit c5bf9b10b9060b750d3651e9c0022ad0261612f8
Author: Tor Lillqvist t...@iki.fi
Date: Mon Mar 5 22:58:20 2012 +0200
Remove unused SbxMemoryStream
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 4ba93cb..7ea3d59 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -112,7 +112,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
basic/source/runtime/step0 \
basic/source/runtime/step1 \
basic/source/runtime/step2 \
- basic/source/sbx/sbxmstrm \
))
endif
diff --git a/basic/inc/basic/sbxmstrm.hxx b/basic/inc/basic/sbxmstrm.hxx
deleted file mode 100644
index 12e1795..000
--- a/basic/inc/basic/sbxmstrm.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#ifndef _SBXMSTRM_HXX
-#define _SBXMSTRM_HXX 1
-
-#include tools/stream.hxx
-#include basic/sbxdef.hxx
-#include basic/sbxcore.hxx
-#include basicdllapi.h
-
-SV_DECL_REF(SbxMemoryStream)
-
-class BASIC_DLLPUBLIC SbxMemoryStream : public SbxBase, public SvMemoryStream
-{
- public:
-SbxMemoryStream(sal_uIntPtr nInitSize_=512, sal_uIntPtr nResize_=64) :
-SvMemoryStream(nInitSize_,nResize_) {}
-~SbxMemoryStream();
-
-virtual SbxDataType GetType() const;
-};
-
-SV_IMPL_REF(SbxMemoryStream)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basic/source/sbx/sbxmstrm.cxx b/basic/source/sbx/sbxmstrm.cxx
deleted file mode 100644
index 9b62a04..000
--- a/basic/source/sbx/sbxmstrm.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * http://www.openoffice.org/license.html
- * for a copy of the LGPLv3 License.
- *
- /
-
-#include basic/sbxmstrm.hxx
-
-SbxDataType SbxMemoryStream::GetType() const
-{
-return SbxMEMORYSTREAM;
-}
-
-SbxMemoryStream::~SbxMemoryStream()
-{
-}
-
-/* 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] .: 2 commits - chart2/source sc/inc sc/source svl/inc svl/source
chart2/source/view/axes/VCartesianAxis.cxx | 70 ++---
chart2/source/view/axes/VCartesianAxis.hxx |4
sc/inc/cell.hxx| 18 +---
sc/inc/compiler.hxx|1
sc/source/core/data/cell.cxx | 55 +
sc/source/core/data/cell2.cxx | 32 +++
sc/source/core/data/table6.cxx | 47 ++-
sc/source/core/tool/cellform.cxx | 38 -
sc/source/core/tool/compiler.cxx |8 +
sc/source/core/tool/interpr1.cxx |2
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |2
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 10 --
sc/source/ui/docshell/impex.cxx|4
sc/source/ui/unoobj/cellsuno.cxx |2
sc/source/ui/view/output2.cxx |6 -
sc/source/ui/view/viewfun4.cxx |4
svl/inc/svl/zforlist.hxx | 11 ++
svl/source/numbers/zforlist.cxx| 43 ++
18 files changed, 197 insertions(+), 160 deletions(-)
New commits:
commit a1410ef073d2117cb2a3c9d9a4e9ecff7d911344
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Mon Mar 5 22:05:51 2012 +0100
move some auto_ptr to boost::scoped_ptr
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx
b/chart2/source/view/axes/VCartesianAxis.cxx
index 8291efb..264450d 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -51,7 +51,7 @@
#include svx/unoshtxt.hxx
#include algorithm
-#include memory
+#include boost/scoped_ptr.hpp
//.
namespace chart
@@ -553,17 +553,14 @@ void VCartesianAxis::createAllTickInfos( ::std::vector
::std::vector TickInfo
VAxisBase::createAllTickInfos(rAllTickInfos);
}
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr TickIter VCartesianAxis::createLabelTickIterator( sal_Int32
nTextLevel )
+TickIter* VCartesianAxis::createLabelTickIterator( sal_Int32 nTextLevel )
{
if( nTextLevel=0 nTextLevel static_cast sal_Int32
(m_aAllTickInfos.size()) )
-return ::std::auto_ptr TickIter ( new PureTickIter(
m_aAllTickInfos[nTextLevel] ) );
-return ::std::auto_ptr TickIter ();
+new PureTickIter( m_aAllTickInfos[nTextLevel] );
+return NULL;
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr TickIter VCartesianAxis::createMaximumLabelTickIterator(
sal_Int32 nTextLevel )
+TickIter* VCartesianAxis::createMaximumLabelTickIterator( sal_Int32 nTextLevel
)
{
if( isComplexCategoryAxis() || isDateAxis() )
{
@@ -576,13 +573,12 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
if( !m_aAllTickInfos.empty() )
{
sal_Int32 nLongestLabelIndex = m_bUseTextLabels ?
this-getIndexOfLongestLabel( m_aTextLabels ) : 0;
-return ::std::auto_ptr TickIter ( new MaxLabelTickIter(
m_aAllTickInfos[0], nLongestLabelIndex ) );
+new MaxLabelTickIter( m_aAllTickInfos[0], nLongestLabelIndex );
}
}
}
-return ::std::auto_ptr TickIter ();
+return NULL;
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
sal_Int32 VCartesianAxis::getTextLevelCount() const
{
@@ -1332,16 +1328,14 @@ void VCartesianAxis::doStaggeringOfLabels( const
AxisLabelProperties rAxisLabel
B2DVector aCummulatedLabelsDistance(0,0);
for( sal_Int32 nTextLevel=0; nTextLevelnTextLevelCount; nTextLevel++ )
{
-SAL_WNODEPRECATED_DECLARATIONS_PUSH
-::std::auto_ptr TickIter apTickIter =
createLabelTickIterator( nTextLevel );
-SAL_WNODEPRECATED_DECLARATIONS_POP
-if(apTickIter.get())
-{
-double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
-aCummulatedLabelsDistance += lcl_getLabelsDistance(
*apTickIter.get()
-, pTickFactory2D-getDistanceAxisTickToText(
m_aAxisProperties )
-, fRotationAngleDegree );
-}
+boost::scoped_ptr TickIter apTickIter(createLabelTickIterator(
nTextLevel ));
+if(apTickIter)
+{
+double fRotationAngleDegree =
m_aAxisLabelProperties.fRotationAngleDegree;
+aCummulatedLabelsDistance += lcl_getLabelsDistance(
*apTickIter.get()
+, pTickFactory2D-getDistanceAxisTickToText(
m_aAxisProperties )
+, fRotationAngleDegree );
+}
}
}
else if( rAxisLabelProperties.getIsStaggered() )
@@ -1367,9 +1361,7 @@ void VCartesianAxis::createLabels()
[Libreoffice-commits] .: 2 commits - solenv/gbuild
solenv/gbuild/AllLangResTarget.mk |1 + solenv/gbuild/ComponentTarget.mk |6 +- solenv/gbuild/Configuration.mk| 24 solenv/gbuild/Deliver.mk |4 ++-- solenv/gbuild/Executable.mk |3 ++- solenv/gbuild/Package.mk |5 - solenv/gbuild/Rdb.mk |6 +- solenv/gbuild/UnoApiTarget.mk |8 ++-- solenv/gbuild/Zip.mk |3 ++- 9 files changed, 47 insertions(+), 13 deletions(-) New commits: commit 90491a073c5b5faee782ad5eab63276fda2342e6 Author: Matúš Kukan matus.ku...@gmail.com Date: Sun Mar 4 18:59:59 2012 +0100 gbuild: do not call mkdir -p in gb_Deliver__deliver Rather create new order-only dependencies on directories where targets should be delivered. On cygwin this is much faster. diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 70151aa..344f6d8 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -356,6 +356,7 @@ $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target, $(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) $(call gb_ResTarget_get_outdir_target,$(1)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1)) +$(call gb_ResTarget_get_outdir_imagelist_target,$(1)) :| $(dir $(call gb_ResTarget_get_outdir_imagelist_target,$(1))) $(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) $(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)),$(1)) diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk index efe4819..adec783 100644 --- a/solenv/gbuild/ComponentTarget.mk +++ b/solenv/gbuild/ComponentTarget.mk @@ -52,6 +52,9 @@ $(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$ $(call gb_ComponentTarget_get_target,%) : $(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xsltproc is missing.)) +$(call gb_ComponentTarget_get_outdir_target,%/) : + mkdir -p $@ + $(call gb_ComponentTarget_get_outdir_target,%) : $(call gb_Deliver_deliver,$,$@) @@ -59,7 +62,8 @@ define gb_ComponentTarget_ComponentTarget $(call gb_ComponentTarget_get_target,$(1)) : COMPONENTPREFIX := $(2) $(call gb_ComponentTarget_get_target,$(1)) : LIBFILENAME := $(3) $(call gb_ComponentTarget_get_outdir_target,$(1)) : \ - $(call gb_ComponentTarget_get_target,$(1)) + $(call gb_ComponentTarget_get_target,$(1)) \ + | $(dir $(call gb_ComponentTarget_get_outdir_target,$(1))) $(call gb_Deliver_add_deliverable,$(call gb_ComponentTarget_get_outdir_target,$(1)),$(call gb_ComponentTarget_get_target,$(1)),$(1)) endef diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 0a9c54c..c16bc13 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -101,6 +101,9 @@ $(call gb_XcsTarget_get_clean_target,%) : rm -f $(call gb_XcsTarget_get_target,$*) \ $(call gb_XcsTarget_get_outdir_target,$(XCSFILE))) +$(call gb_XcsTarget_get_outdir_target,%/) : + mkdir -p $@ + $(call gb_XcsTarget_get_outdir_target,%) : $(call gb_Helper_abbreviate_dirs,\ $(call gb_Deliver_deliver,$,$@)) @@ -142,6 +145,9 @@ $(call gb_XcuDataTarget_get_clean_target,%) : rm -f $(call gb_XcuDataTarget_get_target,$*) \ $(call gb_XcuDataTarget_get_outdir_target,$(XCUFILE))) +$(call gb_XcuDataTarget_get_outdir_target,%/) : + mkdir -p $@ + $(call gb_XcuDataTarget_get_outdir_target,%) : $(call gb_Helper_abbreviate_dirs,\ $(call gb_Deliver_deliver,$,$@)) @@ -179,6 +185,9 @@ $(call gb_XcuModuleTarget_get_clean_target,%) : rm -f $(call gb_XcuModuleTarget_get_target,$*) \ $(call gb_XcuModuleTarget_get_outdir_target,$(XCUFILE))) +$(call gb_XcuModuleTarget_get_outdir_target,%/) : + mkdir -p $@ + $(call gb_XcuModuleTarget_get_outdir_target,%) : $(call gb_Helper_abbreviate_dirs,\ $(call gb_Deliver_deliver,$,$@)) @@ -214,6 +223,9 @@ $(call gb_XcuLangpackTarget_get_clean_target,%) : $(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)) \ $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(XCUFILE),$(lang +$(call gb_XcuLangpackTarget_get_outdir_target,%/) : + mkdir -p $@ + $(call gb_XcuLangpackTarget_get_outdir_target,%) : $(call gb_Helper_abbreviate_dirs,\ $(call gb_Deliver_deliver,$,$@)) @@ -343,7 +355,8 @@ $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE :=
[Libreoffice-commits] .: 2 commits - connectivity/source
connectivity/source/drivers/mozab/MPreparedStatement.cxx| 12 ++--
connectivity/source/inc/dbase/DTable.hxx|2 +-
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx |2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 3dcf3c07aaff2eec0379135ec605396b7002f6a7
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Mon Mar 5 23:13:54 2012 +0100
Translate German comments
diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
index e21ec2f..bc19e36 100644
--- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx
+++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx
@@ -416,11 +416,11 @@ ORowSetValue x)
sal_uInt32 OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const
ReferenceXPropertySet _xCol)
{
OSL_UNUSED( pParameter );
-// Nr. of the new added Parameters
+// Count of the newly added Parameters
sal_uInt32 nParameter = m_xParamColumns-get().size()+1;
-OSL_ENSURE(SQL_ISRULE(pParameter,parameter),OResultSet::AddParameter:
Argument ist kein Parameter);
-OSL_ENSURE(pParameter-count() 0,OResultSet: Fehler im Parse Tree);
+OSL_ENSURE(SQL_ISRULE(pParameter,parameter),OResultSet::AddParameter:
Argument is not a Parameter);
+OSL_ENSURE(pParameter-count() 0,OResultSet: error in parse tree);
#if OSL_DEBUG_LEVEL 0
OSQLParseNode * pMark = pParameter-getChild(0);
OSL_UNUSED( pMark );
@@ -506,13 +506,13 @@ aParseNodes.begin();
//
-
void OPreparedStatement::scanParameter(OSQLParseNode*
pParseNode,::std::vector OSQLParseNode* _rParaNodes)
{
-OSL_ENSURE(pParseNode != NULL,OResultSet: interner Fehler: ungueltiger
ParseNode);
+OSL_ENSURE(pParseNode != NULL,OResultSet: internal error: invalid
ParseNode);
// Parameter Name-Row found?
if (SQL_ISRULE(pParseNode,parameter))
{
-OSL_ENSURE(pParseNode-count() = 1,OResultSet: Parse Tree
fehlerhaft);
-OSL_ENSURE(pParseNode-getChild(0)-getNodeType() ==
SQL_NODE_PUNCTUATION,OResultSet: Parse Tree fehlerhaft);
+OSL_ENSURE(pParseNode-count() = 1,OResultSet: Faulty Parse Tree);
+OSL_ENSURE(pParseNode-getChild(0)-getNodeType() ==
SQL_NODE_PUNCTUATION,OResultSet: Faulty Parse Tree);
_rParaNodes.push_back(pParseNode);
// further search isn't necessary
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index 7a17249..66b077f 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -128,7 +128,7 @@ namespace connectivity
template typename T, SQLSMALLINT sqlTypeId T getInteger (
sal_Int32 columnIndex );
public:
-// ein Konstruktor, der fuer das Returnen des Objektes benoetigt
wird:
+// A ctor needed for returning the object
ODatabaseMetaDataResultSet(OConnection* _pConnection);
commit 2b5327a9b6c3e730cc79db4546f82f9467f80e1a
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Thu Mar 1 12:26:51 2012 +0100
Missed two chars
diff --git a/connectivity/source/inc/dbase/DTable.hxx
b/connectivity/source/inc/dbase/DTable.hxx
index b28392a..6ee8364 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -70,7 +70,7 @@ namespace connectivity
struct DBFHeader { /* Header struct */
DBFType db_typ;/*
File type*/
sal_uInt8db_aedat[3]; /*
Date of last change */
-/*
JJ MM DD */
+/*
YY MM DD */
sal_uInt32 db_anz; /*
Data set count */
sal_uInt16 db_kopf;/*
Header length*/
sal_uInt16 db_slng;/*
Data set length */
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basic/source framework/inc framework/source
basic/source/runtime/methods.cxx |3 +++
basic/source/runtime/methods1.cxx |3 ++-
framework/inc/dispatch/closedispatcher.hxx|1 +
framework/source/dispatch/closedispatcher.cxx | 11 +--
4 files changed, 15 insertions(+), 3 deletions(-)
New commits:
commit fe4bb3579ad4539034deada1e201aa8d9ed6518f
Author: Michael Meeks michael.me...@suse.com
Date: Mon Mar 5 22:31:43 2012 +
basic: add missing forward declarations for helper functions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 28ce80f..fa7d7a1 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -122,6 +122,9 @@ SbxVariable* getDefaultProp( SbxVariable* pRef );
#ifndef DISABLE_SCRIPTING
+// forward decl.
+sal_Bool implDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int16 nDay,
double rdRet );
+
// from source/classes/sbxmod.cxx
Reference XModel getDocumentModel( StarBASIC* );
diff --git a/basic/source/runtime/methods1.cxx
b/basic/source/runtime/methods1.cxx
index 91c739f..51f73d1 100644
--- a/basic/source/runtime/methods1.cxx
+++ b/basic/source/runtime/methods1.cxx
@@ -70,6 +70,7 @@ using namespace com::sun::star::i18n;
void unoToSbxValue( SbxVariable* pVar, const Any aValue );
Any sbxToUnoValue( SbxVariable* pVar, const Type rType,
com::sun::star::beans::Property* pUnoProperty = NULL );
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16
nFirstDay = 0 );
static Reference XCalendar3 getLocaleCalendar( void )
{
@@ -3210,7 +3211,7 @@ RTLFUNC(Me)
#endif
-sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam = false, sal_Int16
nFirstDay = 0 )
+sal_Int16 implGetWeekDay( double aDate, bool bFirstDayParam, sal_Int16
nFirstDay )
{
Date aRefDate( 1,1,1900 );
long nDays = (long) aDate;
commit 5b2cb23c429e1be1099008473770c634ce96c969
Author: Michael Meeks michael.me...@suse.com
Date: Mon Mar 5 21:18:00 2012 +
attempt fix of hang on base close, due to solarmutex deadlock on join
diff --git a/framework/inc/dispatch/closedispatcher.hxx
b/framework/inc/dispatch/closedispatcher.hxx
index 81d8842..eabad8c 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -206,6 +206,7 @@ class CloseDispatcher : public css::lang::XTypeProvider
during they call us ...
*/
DECL_LINK( impl_asyncCallback, void* );
+void doClose();
//---
/** @short prepare m_xCloseFrame so it should be closeable without
problems.
diff --git a/framework/source/dispatch/closedispatcher.cxx
b/framework/source/dispatch/closedispatcher.cxx
index 01523d2..0b670eb 100644
--- a/framework/source/dispatch/closedispatcher.cxx
+++ b/framework/source/dispatch/closedispatcher.cxx
@@ -268,6 +268,13 @@ void SAL_CALL
CloseDispatcher::dispatchWithNotification(const css::util::URL
*/
IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
{
+SolarMutexReleaser aReleaser;
+doClose();
+return 0;
+}
+
+void CloseDispatcher::doClose()
+{
try
{
@@ -296,7 +303,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
// frame already dead ?!
// Nothing to do !
if (! xCloseFrame.is())
-return 0;
+return;
sal_Bool bCloseFrame = sal_False;
sal_Bool bEstablishBackingMode = sal_False;
@@ -452,7 +459,7 @@ IMPL_LINK_NOARG(CloseDispatcher, impl_asyncCallback)
{
}
-return 0;
+return;
}
//---
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: connectivity/source
connectivity/source/inc/odbc/OFunctiondefs.hxx | 20 connectivity/source/inc/odbc/OPreparedStatement.hxx | 13 - connectivity/source/inc/odbc/OResultSet.hxx |2 +- connectivity/source/inc/odbc/OResultSetMetaData.hxx |4 ++-- connectivity/source/inc/odbc/OStatement.hxx |2 +- connectivity/source/parse/sqliterator.cxx |4 ++-- 6 files changed, 18 insertions(+), 27 deletions(-) New commits: commit b5995754836c864bb38446060e17772c63253e37 Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Mon Mar 5 23:34:51 2012 +0100 Translate German comments, fix some whitespace diff --git a/connectivity/source/inc/odbc/OFunctiondefs.hxx b/connectivity/source/inc/odbc/OFunctiondefs.hxx index a53f072..e4c8968 100644 --- a/connectivity/source/inc/odbc/OFunctiondefs.hxx +++ b/connectivity/source/inc/odbc/OFunctiondefs.hxx @@ -65,16 +65,15 @@ #ifdef ODBCIMP -// Stub-Version: dynamische Bindung an die DLL zur Laufzeit. -// odbcstub definiert die in den Quellen benutzten NSQL...-Methoden -// als indirekte Funktionsaufrufe. -// odbcimp zieht sich selbst preos2, odbc und postos2 an. +// Stub version: dynamic binding to the DLL at runtime. +// odbcstub defines the NSQL... methods used in the sources +// as indirect function calls. +// odbcimp uses preos2, odbc and postos2 itself. // #include odbc3imp.hxx #else -// Zur Zeit verwenden wir die ODBC-DLL von Watcom-SQL direkt (ueber die -// mitgelieferte Lib). +// Currently, we directly use the ODBC DLL from Watcom SQL (via the supplied lib) #ifndef ODBC_OS2 #define ODBC_OS2 @@ -101,8 +100,7 @@ #endif -// In der ODBC.H von Watcom werden Strings als char * erwartet -// (nicht, wie sonst bei ODBC ueblich, als UCHAR *). +// The ODBC.h from Watcom expects char*, not UCHAR* usually used with ODBC #if defined( ICC ) #define SDB_ODBC_CHAR unsigned char #else @@ -115,8 +113,7 @@ #ifdef UNX -// Zur Zeit verwenden wir die ODBC-shared library von Q+E direkt (ueber die -// mitgelieferte Lib). +// Currently, we directly use the ODBC shared library from Q+E (via the supplied lib) #ifndef ODBC_UNX #define ODBC_UNX @@ -128,8 +125,7 @@ #else #include odbc/sqlext.h #endif -#undef sal_Bool // Ist in qeodbc.h definiert, wird aber von solar.h noch einmal -// definiert. +#undef sal_Bool // Is defined in qeodbc.h, but gets redefined by solar.h #define SDB_ODBC_CHAR UCHAR #define SQL_WCHAR (-8) diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx index 076c9e0..7841456 100644 --- a/connectivity/source/inc/odbc/OPreparedStatement.hxx +++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx @@ -71,16 +71,11 @@ namespace connectivity // // Data attributes // -SQLSMALLINT numParams; // Number of parameter markers -// for the prepared statement +SQLSMALLINT numParams; // Number of parameter markers for the prepared statement OBoundParam*boundParams; -// Array of bound parameter -// objects. Each parameter -// marker will have a -// corresponding object to -// hold bind information, and -// resulting data. +// Array of bound parameter objects. Each parameter marker will have a +// corresponding object to hold bind information, and resulting data. ::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSetMetaData m_xMetaData; sal_Bool m_bPrepared; @@ -109,7 +104,7 @@ namespace connectivity throw (::com::sun::star::uno::Exception); public: DECLARE_SERVICE_INFO(); -// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: +// A ctor, needed to return the object OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString sql); //XInterface diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index e036225..c74407a 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -200,7 +200,7 @@ namespace connectivity ) const; public: DECLARE_SERVICE_INFO(); -// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: +
[Libreoffice-commits] .: connectivity/source
connectivity/source/drivers/mozab/MPreparedStatement.hxx |5 ++--- connectivity/source/parse/sqliterator.cxx|2 +- 2 files changed, 3 insertions(+), 4 deletions(-) New commits: commit 38b510af0a5ed1cd365666af84a062b2e67c00d5 Author: Philipp Weissenbacher p.weissenbac...@gmail.com Date: Mon Mar 5 23:56:13 2012 +0100 Finish translating connectivity, fix some whitespace diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx index 31cfa97..2151b3d 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx @@ -69,8 +69,7 @@ namespace connectivity // // Data attributes // -sal_Int32 m_nNumParams; // Number of parameter markers -// for the prepared statement +sal_Int32 m_nNumParams; // Number of parameter markers for the prepared statement ::rtl::OUString m_sSqlStatement; ::com::sun::star::uno::Reference ::com::sun::star::sdbc::XResultSetMetaData m_xMetaData; @@ -109,7 +108,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); -// ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: +// A ctor need for returning the object OPreparedStatement( OConnection* _pConnection,const ::rtl::OUString sql); void lateInit(); diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index c9d001d..11f95c5 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1993,7 +1993,7 @@ const OSQLParseNode* OSQLParseTreeIterator::getOrderTree() const OSL_ENSURE(pTableExp-count() == TABLE_EXPRESSION_CHILD_COUNT,OSQLParseTreeIterator: error in parse tree!); pOrderClause = pTableExp-getChild(ORDER_BY_CHILD_POS); -// Wenn es aber eine order_by ist, dann darf sie nicht leer sein: +// If it is a order_by, it must not be empty if(pOrderClause-count() != 3) pOrderClause = NULL; return pOrderClause; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/UnoApiTarget.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit a5d28eaa69827ea3efe12f36517bb3e6915b1c8d Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Mar 6 01:13:36 2012 +0100 UnoApiTarget: add missing dependency diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index faee295..9d0cfc6 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -55,7 +55,8 @@ endef define gb_UnoApiTarget_UnoApiTarget $$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1 -$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) +$(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) \ + | $(dir $(call gb_UnoApiOutTarget_get_target,$(1))) $(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1)) $(call gb_UnoApiTarget_get_target,$(1)) : INCLUDE := $(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_DEPS := ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/app/inputwin.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 77a517a467b3aa944e31b170162518f70da3793d
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Mar 6 01:16:43 2012 +0100
don't crash when scrolling in input line, fdo#46975
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 3a53bb0..c60b6ff 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1613,6 +1613,10 @@ void ScTextWnd::Command( const CommandEvent rCEvt )
rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
}
}
+else if ( nCommand == COMMAND_WHEEL )
+{
+//don't call InputChanged for COMMAND_WHEEL
+}
else
SC_MOD()-InputChanged( pEditView );
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: forms/source
forms/source/component/Button.cxx | 16 ++---
forms/source/component/Button.hxx |4 +--
forms/source/component/CheckBox.cxx|4 +--
forms/source/component/Columns.cxx | 20
forms/source/component/Columns.hxx |6 ++---
forms/source/component/ComboBox.cxx| 26 +++---
forms/source/component/ComboBox.hxx|4 +--
forms/source/component/Edit.cxx| 18 +++
forms/source/component/EditBase.cxx| 12 +-
forms/source/component/EditBase.hxx|2 -
forms/source/component/EventThread.cxx | 39 +++--
forms/source/component/EventThread.hxx | 26 ++
12 files changed, 86 insertions(+), 91 deletions(-)
New commits:
commit b9046068b187f52c2b64be694b9f6cf7e8602246
Author: Philipp Weissenbacher p.weissenbac...@gmail.com
Date: Tue Mar 6 02:04:46 2012 +0100
Translate German comments, fix some whitespace and bad translations
diff --git a/forms/source/component/Button.cxx
b/forms/source/component/Button.cxx
index 0ae1f87..b3ceefa 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -382,13 +382,13 @@ OButtonControl::OButtonControl(const
ReferenceXMultiServiceFactory _rxFactory
{
increment(m_refCount);
{
-// als ActionListener anmelden
+// Register as ActionListener
ReferenceXButton xButton;
query_aggregation( m_xAggregate, xButton);
if (xButton.is())
xButton-addActionListener(this);
}
-// Refcount bei 1 fuer Listener
+// For Listener: refcount at one
decrement(m_refCount);
}
@@ -399,7 +399,7 @@ OButtonControl::~OButtonControl()
Application::RemoveUserEvent(m_nClickEvent);
}
-// UNO Anbindung
+// UNO binding
//--
Any SAL_CALL OButtonControl::queryAggregation(const Type _rType) throw
(RuntimeException)
{
@@ -437,7 +437,7 @@ void SAL_CALL OButtonControl::disposing( const EventObject
_rSource ) throw( Ru
//--
void OButtonControl::actionPerformed(const ActionEvent /*rEvent*/) throw (
::com::sun::star::uno::RuntimeException)
{
-// Asynchron fuer starutil::URL-Button
+// Asynchronous for starutil::URL-Button
sal_uLong n = Application::PostUserEvent( LINK(this,
OButtonControl,OnClick) );
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -459,8 +459,8 @@ IMPL_LINK_NOARG(OButtonControl, OnClick)
}
else
{
-// Sonst nicht. Dann darf man aber auf keinen Fal die Listener
-// benachrichtigen, auch dann nicht, wenn er spaeter hinzukommt.
+// Else, don't. We then must not notify the Listeners in any case,
+// not even if added later on.
aGuard.clear();
// recognize the button type
@@ -485,7 +485,7 @@ IMPL_LINK_NOARG(OButtonControl, OnClick)
#ifdef DBG_UTIL
catch( const RuntimeException )
{
-// silent this
+// silence this
}
#endif
catch( const Exception )
@@ -685,7 +685,7 @@ sal_Int16 OButtonControl::getModelUrlFeatureId( ) const
xModelProps-getPropertyValue( PROPERTY_BUTTONTYPE ) = eButtonType;
}
-// are we an URL button?
+// are we a URL button?
if ( eButtonType == FormButtonType_URL )
{
// is it a feature URL?
diff --git a/forms/source/component/Button.hxx
b/forms/source/component/Button.hxx
index 1c6b168..0fe5505 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -135,7 +135,7 @@ private:
protected:
-// UNO Anbindung
+// UNO binding
virtual ::com::sun::star::uno::Sequence ::com::sun::star::uno::Type
_getTypes();
public:
@@ -146,7 +146,7 @@ public:
IMPLEMENTATION_NAME(OButtonControl);
virtual StringSequence SAL_CALL getSupportedServiceNames() throw();
-// UNO Anbindung
+// UNO binding
DECLARE_UNO3_AGG_DEFAULTS(OButtonControl, OClickableImageBaseControl);
virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(const
::com::sun::star::uno::Type _rType)
throw(::com::sun::star::uno::RuntimeException);
diff --git a/forms/source/component/CheckBox.cxx
b/forms/source/component/CheckBox.cxx
index 3a622e2..15042a7 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -205,7 +205,7 @@ void SAL_CALL OCheckBoxModel::read(const
Referencestario::XObjectInputStream
setReferenceValue( sReferenceValue );
setDefaultChecked( static_cast ToggleState ( nDefaultChecked ) );
-// Nach dem Lesen die Defaultwerte anzeigen
+// After reading in, display the default values
if ( !getControlSource().isEmpty() )
// (not if we don't have a control source - the State property acts
[Libreoffice-commits] .: sc/source svx/inc svx/source
sc/source/ui/app/scdll.cxx |2 +-
sc/source/ui/view/formatsh.cxx |2 +-
svx/inc/svx/tbcontrl.hxx |3 +++
svx/source/tbxctrls/tbcontrl.cxx | 15 +--
svx/source/tbxctrls/tbxcolorupdate.cxx |1 +
5 files changed, 19 insertions(+), 4 deletions(-)
New commits:
commit 4236f5e19c5d3f3a5007c7a596868d09a7e39bee
Author: Winfried Donkers o...@dci-electronics.nl
Date: Mon Mar 5 17:24:40 2012 +0100
fdo#45688: Split button for Calc cell font color
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index cb98122..ece5a1f 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -203,7 +203,7 @@ void ScDLL::Init()
SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY,
pMod);
SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT,
pMod);
// SvxFontHeightToolBoxControl
::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
-SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR,
pMod);
+SvxColorExtToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR,
pMod);
SvxColorExtToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR,
pMod);
SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER,
pMod);
SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE,
pMod);
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index bc72117..61522d6 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1425,11 +1425,11 @@ void ScFormatShell::ExecuteAttr( SfxRequest rReq )
sal_uInt16 nSlot = rReq.GetSlot();
pTabViewShell-HideListBox(); //
Autofilter-DropDown-Listbox
-
if ( !pNewAttrs )
{
switch ( nSlot )
{
+case SID_ATTR_CHAR_COLOR:
case SID_ATTR_CHAR_FONT:
case SID_ATTR_CHAR_FONTHEIGHT:
pTabViewShell-ExecuteCellFormatDlg( rReq, TP_FONT ); //
wenn ToolBar vertikal
diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 3f2bd39..8fb558e 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -74,6 +74,9 @@
Execute-Id SID_ATTR_CHAR_COLOR2
and SID_ATTR_CHAR_COLOR_EXT
+for cell color (calc)
+Execute-Id SID_ATTR_CHAR_COLOR
+
for character background color (writer)
Execute-Id SID_ATTR_CHAR_COLOR_BACKGROUND
and SID_ATTR_CHAR_COLOR_BACKGROUND_EXT
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index e366952..2a20d4a 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2325,6 +2325,7 @@ void SvxColorExtToolBoxControl::StateChanged(
bChoiceFromPalette = sal_False;
switch( nSID )
{
+case SID_ATTR_CHAR_COLOR :
case SID_ATTR_CHAR_COLOR2 :
case SID_ATTR_CHAR_COLOR_BACKGROUND :
case SID_BACKGROUND_COLOR :
@@ -2347,21 +2348,28 @@ void SvxColorExtToolBoxControl::Select( sal_Bool )
{
OUString aCommand;
OUString aParamName;
+sal_Bool bNoArgs = sal_False;
switch( GetSlotId() )
{
case SID_ATTR_CHAR_COLOR2 :
-case SID_ATTR_CHAR_COLOR :
+bNoArgs = sal_True;
aCommand= OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:CharColorExt ));
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM(
CharColorExt ));
break;
+case SID_ATTR_CHAR_COLOR :
+aCommand= OUString( RTL_CONSTASCII_USTRINGPARAM( .uno:Color
));
+aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM( Color ));
+break;
+
case SID_BACKGROUND_COLOR :
aCommand= OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:BackgroundColor ));
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM(
BackgroundColor ));
break;
case SID_ATTR_CHAR_COLOR_BACKGROUND :
+bNoArgs = sal_True;
aCommand= OUString( RTL_CONSTASCII_USTRINGPARAM(
.uno:CharBackgroundExt ));
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM(
CharBackgroundExt ));
break;
@@ -2369,7 +2377,10 @@ void SvxColorExtToolBoxControl::Select( sal_Bool )
Sequence PropertyValue aArgs( 1 );
aArgs[0].Name = aParamName;
-aArgs[0].Value = makeAny( (sal_uInt32)( mLastColor.GetColor() ));
+if ( bNoArgs )
+aArgs[0].Value = makeAny( GetToolBox().IsItemChecked( GetId() ));
+else
+aArgs[0].Value = makeAny( (sal_uInt32)( mLastColor.GetColor() ));
Dispatch( aCommand, aArgs );
}
diff --git a/svx/source/tbxctrls/tbxcolorupdate.cxx
b/svx/source/tbxctrls/tbxcolorupdate.cxx
index 5c3453a..1b567d4 100644
--- a/svx/source/tbxctrls/tbxcolorupdate.cxx
+++
