[Libreoffice-commits] .: desktop/unx
desktop/unx/source/splashx.c |6 ++
1 file changed, 6 insertions(+)
New commits:
commit 48efe5ce26b519a1a87da1d0ee1acefcb000934e
Author: August Sodora aug...@gmail.com
Date: Thu Nov 17 21:06:16 2011 -0500
Valgrind: fixed memory leak
diff --git a/desktop/unx/source/splashx.c b/desktop/unx/source/splashx.c
index 0c7024d..3d3981d 100644
--- a/desktop/unx/source/splashx.c
+++ b/desktop/unx/source/splashx.c
@@ -744,6 +744,12 @@ void splash_destroy(struct splash* splash)
{
if(splash-display)
{
+if(splash-gc)
+{
+XFreeGC(splash-display, splash-gc);
+splash-gc = NULL;
+}
+
XCloseDisplay( splash-display );
splash-display = NULL;
png_destroy_read_struct( (splash-png_ptr), (splash-info_ptr),
NULL );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: cui/source
cui/source/dialogs/hyphen.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit c69c088a117857521efc619bb53baee087ca
Author: Niklas Johansson niklas@niklas-VirtualBox.(none)
Date: Mon Nov 7 16:51:27 2011 +0100
Fixed for bug 40505 UI: HYPHENATION Right/Left arrow key reversed (keyboard)
SvxHyphenWordDialog::SelLeft() and SvxHyphenWordDialog::SelRight() was
reversed witch caused the arrowkeys to be reversed in the hyphenation
dialog.
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 1b9b63b..da10e83 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -640,13 +640,13 @@ void SvxHyphenWordDialog::SetWindowTitle( LanguageType
nLang )
void SvxHyphenWordDialog::SelLeft()
{
-m_pImpl-SelRight_Impl();
+m_pImpl-SelLeft_Impl();
}
void SvxHyphenWordDialog::SelRight()
{
-m_pImpl-SelLeft_Impl();
+m_pImpl-SelRight_Impl();
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source
basctl/source/basicide/linenumberwindow.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 28590197df79b89ff15c43636b26dc1dde7a66c8 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Nov 18 11:39:03 2011 +0100 -Werror=shadow fix diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx index d4f606b..2f593e9 100644 --- a/basctl/source/basicide/linenumberwindow.cxx +++ b/basctl/source/basicide/linenumberwindow.cxx @@ -57,8 +57,8 @@ void LineNumberWindow::Paint( const Rectangle ) } sal_Int64 y = (nStartLine - 1) * nLineHeight; -for(int i = nStartLine; i = nEndLine; ++i, y += nLineHeight) -DrawText(Point(0, y - m_nCurYOffset), String::CreateFromInt32(i)); +for(int n = nStartLine; n = nEndLine; ++n, y += nLineHeight) +DrawText(Point(0, y - m_nCurYOffset), String::CreateFromInt32(n)); } void LineNumberWindow::DataChanged(DataChangedEvent const rDCEvt) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/remotes/origin/libreoffice-3-4-0' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/remotes/origin/libreoffice-3-4-1' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/remotes/origin/libreoffice-3-4' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/remotes/origin/HEAD' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/remotes/origin/master' - 0 commits -
Rebased ref, commits from common ancestor: ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - sw/source vcl/source
sw/source/ui/inc/pview.hxx|1 +
sw/source/ui/uno/unotxdoc.cxx | 16 +---
vcl/source/gdi/print3.cxx |5 -
3 files changed, 14 insertions(+), 8 deletions(-)
New commits:
commit ce888a74614aa83e17a34e557f416acb262419a1
Author: Ivan Timofeev timofeev@gmail.com
Date: Wed Nov 16 15:47:51 2011 +0400
fix fdo#42178: crash when printing from Page Preview
diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx
index e9902fb..329ba5e 100644
--- a/sw/source/ui/inc/pview.hxx
+++ b/sw/source/ui/inc/pview.hxx
@@ -273,6 +273,7 @@ public:
voidShowVScrollbar(sal_Bool bShow);
sal_uInt16 GetPageCount() const{ return mnPageCount; }
+sal_uInt16 GetSelectedPage() const {return aViewWin.SelectedPage();}
sal_BoolHandleWheelCommands( const CommandEvent );
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index c849fa7..4a1ef26 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -187,10 +187,20 @@ SwPrintUIOptions * lcl_GetPrintUIOptions(
const SwPrintData rPrintData = pDocShell-GetDoc()-getPrintData();
// Get current page number
+sal_uInt16 nCurrentPage = 1;
SwWrtShell* pSh = pDocShell-GetWrtShell();
-SwPaM* pShellCrsr = pSh-GetCrsr();
-sal_uInt16 nCurrentPage = pShellCrsr-GetPageNum(sal_True, 0);
-
+if (pSh)
+{
+SwPaM* pShellCrsr = pSh-GetCrsr();
+nCurrentPage = pShellCrsr-GetPageNum(sal_True, 0);
+}
+else
+{
+const SwPagePreView* pPreView = dynamic_cast const SwPagePreView*
(pView);
+OSL_ENSURE(pPreView, Unexpected type of the view shell);
+if (pPreView)
+nCurrentPage = pPreView-GetSelectedPage();
+}
return new SwPrintUIOptions( nCurrentPage, bWebDoc, bSwSrcView,
bHasSelection, bHasPostIts, rPrintData );
}
commit 639f7b562c0e3304e3b087d86ea2a1134bc0d044
Author: Ivan Timofeev timofeev@gmail.com
Date: Fri Nov 18 15:58:27 2011 +0400
fix UI updating in the print dialog
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
index c2b0e87..3d13fd8 100644
--- a/vcl/source/gdi/print3.cxx
+++ b/vcl/source/gdi/print3.cxx
@@ -869,11 +869,6 @@ PrinterController::PageSize
PrinterController::getPageFile( int i_nUnfilteredPag
Sequence PropertyValue aPageParm( getPageParametersProtected(
i_nUnfilteredPage ) );
const MapMode aMapMode( MAP_100TH_MM );
-if (mpImplData-meJobState != view::PrintableState_JOB_STARTED)
-{ // rhbz#657394: check that we are still printing...
-return PrinterController::PageSize();
-}
-
mpImplData-mpPrinter-Push();
mpImplData-mpPrinter-SetMapMode( aMapMode );
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/filter
binfilter/filter/source/bf_offwrp/makefile.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 28b2bf8f375fa16587ba32e489480174f510dde1 Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Fri Jul 8 11:04:50 2011 +0200 another fix for --as-needed diff --git a/binfilter/filter/source/bf_offwrp/makefile.mk b/binfilter/filter/source/bf_offwrp/makefile.mk index d65beed..0545931 100644 --- a/binfilter/filter/source/bf_offwrp/makefile.mk +++ b/binfilter/filter/source/bf_offwrp/makefile.mk @@ -52,7 +52,6 @@ SHL1STDLIBS=\ $(BFSVTOOLLIB) \ $(BFOFALIB)\ $(VCLLIB) \ -$(SOTLIB) \ $(SALLIB) \ $(TOOLSLIB)\ $(CPPULIB) \ @@ -64,6 +63,7 @@ SHL1STDLIBS=\ $(BFSCLIB) \ $(BFSVXLIB) \ $(BFSO3LIB)\ +$(SOTLIB) \ $(UNOTOOLSLIB) \ $(COMPHELPERLIB) \ $(LEGACYSMGRLIB) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sfx2/source
sfx2/source/appl/appopen.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 443e1b1566d678c79658f2a48aa4b088ed914fa3
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 9 08:37:56 2011 +0100
Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO
3.5).
This backports the reading half of CWS mav60 plus
http://cgit.freedesktop.org/
libreoffice/core/commit/?id=2d775f593abd9bc487ccc60f06aa5a3ca9632056
Produce
correct sha256 uri, consume correct uri and original spec typo. It spans
the
repos components, libs-core, libs-gui, and ure.
diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 6ec4645..84f0cef 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -288,8 +288,9 @@ private:
}
catch( const uno::Exception )
{
-// unknown error, do not try to ask again
-eResult = ::comphelper::DocPasswordVerifierResult_ABORT;
+// unknown error, report it as wrong password
+// TODO/LATER: we need an additional way to report unknown problems in
this case
+eResult = ::comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
}
return eResult;
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - comphelper/inc comphelper/source
comphelper/inc/comphelper/storagehelper.hxx |1
comphelper/source/misc/storagehelper.cxx| 37
2 files changed, 33 insertions(+), 5 deletions(-)
New commits:
commit d87712a52d33ade9fd2821b91caf92d11ef31a93
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 9 08:38:58 2011 +0100
Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO
3.5).
This backports the reading half of CWS mav60 plus
http://cgit.freedesktop.org/
libreoffice/core/commit/?id=2d775f593abd9bc487ccc60f06aa5a3ca9632056
Produce
correct sha256 uri, consume correct uri and original spec typo. It spans
the
repos components, libs-core, libs-gui, and ure.
diff --git a/comphelper/inc/comphelper/storagehelper.hxx
b/comphelper/inc/comphelper/storagehelper.hxx
index 2f83331..807c6dd 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -45,6 +45,7 @@
#define ZIP_STORAGE_FORMAT_STRING ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( ZipFormat ) )
#define OFOPXML_STORAGE_FORMAT_STRING ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( OFOPXMLFormat ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA256UTF8EncryptionKey ) )
#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1UTF8EncryptionKey ) )
#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( PackageSHA1MS1252EncryptionKey ) )
diff --git a/comphelper/source/misc/storagehelper.cxx
b/comphelper/source/misc/storagehelper.cxx
index f703cd3..112ddf1 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.cxx
@@ -35,6 +35,9 @@
#include com/sun/star/beans/PropertyValue.hpp
#include com/sun/star/beans/NamedValue.hpp
#include com/sun/star/beans/IllegalTypeException.hpp
+#include com/sun/star/xml/crypto/XDigestContext.hpp
+#include com/sun/star/xml/crypto/XDigestContextSupplier.hpp
+#include com/sun/star/xml/crypto/DigestID.hpp
#include rtl/digest.h
@@ -427,14 +430,38 @@ uno::Sequence beans::NamedValue
OStorageHelper::CreatePackageEncryptionData(
{
// TODO/LATER: Should not the method be part of DocPasswordHelper?
uno::Sequence beans::NamedValue aEncryptionData;
+sal_Int32 nSha1Ind = 0;
if ( aPassword.getLength() )
{
+// generate SHA256 start key
+try
+{
+uno::Reference lang::XMultiServiceFactory xFactory(
::comphelper::getProcessServiceFactory() );
+if ( !xFactory.is() )
+throw uno::RuntimeException();
+
+uno::Reference xml::crypto::XDigestContextSupplier
xDigestContextSupplier( xFactory-createInstance( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.xml.crypto.NSSInitializer ) ) ),
uno::UNO_QUERY_THROW );
+uno::Reference xml::crypto::XDigestContext xDigestContext(
xDigestContextSupplier-getDigestContext( xml::crypto::DigestID::SHA256,
uno::Sequence beans::NamedValue () ), uno::UNO_SET_THROW );
+
+::rtl::OString aUTF8Password( ::rtl::OUStringToOString( aPassword,
RTL_TEXTENCODING_UTF8 ) );
+xDigestContext-updateDigest( uno::Sequence sal_Int8 (
reinterpret_cast const sal_Int8* ( aUTF8Password.getStr() ),
aUTF8Password.getLength() ) );
+uno::Sequence sal_Int8 aDigest =
xDigestContext-finalizeDigestAndDispose();
+
+aEncryptionData.realloc( ++nSha1Ind );
+aEncryptionData[0].Name = PACKAGE_ENCRYPTIONDATA_SHA256UTF8;
+aEncryptionData[0].Value = aDigest;
+}
+catch ( uno::Exception )
+{
+OSL_ENSURE( false, Can not create SHA256 digest! );
+}
+
// MS_1252 encoding was used for SO60 document format password
encoding,
// this encoding supports only a minor subset of nonascii characters,
// but for compatibility reasons it has to be used for old document
formats
-aEncryptionData.realloc( 2 );
-aEncryptionData[0].Name = PACKAGE_ENCRYPTIONDATA_SHA1UTF8;
-aEncryptionData[1].Name = PACKAGE_ENCRYPTIONDATA_SHA1MS1252;
+aEncryptionData.realloc( nSha1Ind + 2 );
+aEncryptionData[nSha1Ind].Name = PACKAGE_ENCRYPTIONDATA_SHA1UTF8;
+aEncryptionData[nSha1Ind + 1].Name = PACKAGE_ENCRYPTIONDATA_SHA1MS1252;
rtl_TextEncoding pEncoding[2] = { RTL_TEXTENCODING_UTF8,
RTL_TEXTENCODING_MS_1252 };
@@ -450,11 +477,11 @@ uno::Sequence beans::NamedValue
OStorageHelper::CreatePackageEncryptionData(
if ( nError != rtl_Digest_E_None )
{
-aEncryptionData.realloc( 0 );
+aEncryptionData.realloc( nSha1Ind );
break;
}
-aEncryptionData[nInd].Value = uno::Sequence sal_Int8 (
(sal_Int8*)pBuffer, RTL_DIGEST_LENGTH_SHA1 );
+
[Libreoffice-commits] .: Branch 'libreoffice-3-4' - offapi/com
offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl | 118 ++
offapi/com/sun/star/embed/makefile.mk |1
offapi/com/sun/star/xml/crypto/CipherID.idl | 59 +++
offapi/com/sun/star/xml/crypto/DigestID.idl | 71
offapi/com/sun/star/xml/crypto/SEInitializer.idl |4
offapi/com/sun/star/xml/crypto/XCipherContext.idl | 88 ++
offapi/com/sun/star/xml/crypto/XCipherContextSupplier.idl | 91 ++
offapi/com/sun/star/xml/crypto/XDigestContext.idl | 73
offapi/com/sun/star/xml/crypto/XDigestContextSupplier.idl | 82 +
offapi/com/sun/star/xml/crypto/makefile.mk|6
10 files changed, 593 insertions(+)
New commits:
commit d53922c3511a70567f43d17480514d77e81c168c
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Nov 9 08:35:42 2011 +0100
Backport reading AES-encrypted ODF 1.2 documents (as genereated by LibO
3.5).
This backports the reading half of CWS mav60 plus
http://cgit.freedesktop.org/
libreoffice/core/commit/?id=2d775f593abd9bc487ccc60f06aa5a3ca9632056
Produce
correct sha256 uri, consume correct uri and original spec typo. It spans
the
repos components, libs-core, libs-gui, and ure.
diff --git a/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
b/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
new file mode 100644
index 000..91f1199
--- /dev/null
+++ b/offapi/com/sun/star/embed/XEncryptionProtectedStorage.idl
@@ -0,0 +1,118 @@
+/*
+ *
+ * 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 __com_sun_star_embed_XEncryptionProtectedStorage_idl__
+#define __com_sun_star_embed_XEncryptionProtectedStorage_idl__
+
+#ifndef __com_sun_star_embed_XEncryptionProtectedSource2_idl__
+#include com/sun/star/embed/XEncryptionProtectedSource2.idl
+#endif
+
+#ifndef __com_sun_star_beans_NamedValue_idl__
+#include com/sun/star/beans/NamedValue.idl
+#endif
+
+#ifndef __com_sun_star_lang_IllegalArgumentException_idl__
+#include com/sun/star/lang/IllegalArgumentException.idl
+#endif
+
+#ifndef __com_sun_star_xml_crypto_DigestID_idl__
+#include com/sun/star/xml/crypto/DigestID.idl
+#endif
+
+#ifndef __com_sun_star_xml_crypto_CipherID_idl__
+#include com/sun/star/xml/crypto/CipherID.idl
+#endif
+
+//
+
+module com { module sun { module star { module embed {
+
+//
+/** This interface allows to set a password for an object.
+
+This unpublished interface was introduced into a micro update of
+LibreOffice 3.4; it is unclear in what exact form it will be included in
+LibreOffice 3.5. A corresponding OOo interface (which is also unpublished)
+is scheduled for inclusion into OOo 3.4 and contains an additional
+getEncryptionAlgorithms method.
+ */
+interface XEncryptionProtectedStorage: XEncryptionProtectedSource2
+{
+// ---
+/** allows to set the encryption algorithms for the object.
+p
+The algorithms will of course be used only for streams that have been
+marked to be encrypted. If no stream in the storage is marked to be
+encrypted, the algorithms-related information may have no effect to
+the result package.
+/p
+
+p
+The following values could be part of the provided sequence:
+/p
+dl
+dtStartKeyGenerationAlgorithm/dt
+dd
+specifies the algorithm that was used to generate
+the EncryptionKey from the original password; in case
+the contents should be decrypted, the algorithm might
+be
[Libreoffice-commits] .: src/xlsrecord.py
src/xlsrecord.py |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit 942b730aca24786d07f5bcd20455b1deae646b83 Author: Kohei Yoshida kohei.yosh...@suse.com Date: Fri Nov 18 11:18:37 2011 -0500 Correctly parse string data for AUTOFILTER. diff --git a/src/xlsrecord.py b/src/xlsrecord.py index 1fec69c..2cdb224 100644 --- a/src/xlsrecord.py +++ b/src/xlsrecord.py @@ -231,6 +231,9 @@ Like parseBytes(), the derived classes must overwrite this method. cch = self.readUnsignedInt(1) return self.readUnicodeString(cch) +def readXLUnicodeStringNoCch (self, cch): +return self.readUnicodeString(cch) + def readLongRGB (self): r = self.readUnsignedInt(1) g = self.readUnsignedInt(1) @@ -412,11 +415,11 @@ class Autofilter(BaseRecordHandler): # pick up string(s) self.string1 = None if self.doper1.dataType == Autofilter.DoperType.String: -self.string1 = globals.getTextBytes(self.readBytes(self.doper1.strLen)) +self.string1 = self.readXLUnicodeStringNoCch(self.doper1.strLen) self.string2 = None if self.doper2.dataType == Autofilter.DoperType.String: -self.string2 = globals.getTextBytes(self.readBytes(self.doper2.strLen)) +self.string2 = self.readXLUnicodeStringNoCch(self.doper2.strLen) def parseBytes (self): self.__parseBytes() ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - default_images/svx ooo_custom_images/hicontrast ooo_custom_images/industrial svx/inc svx/source
default_images/svx/res/cropmarkers.png|binary
default_images/svx/res/markers.png|binary
ooo_custom_images/hicontrast/svx/res/cropmarkers.png |binary
ooo_custom_images/hicontrast/svx/res/markers.png |binary
ooo_custom_images/industrial/cmd/lc_bezierappend.png |binary
ooo_custom_images/industrial/cmd/lc_bezierclose.png |binary
ooo_custom_images/industrial/cmd/lc_bezierconvert.png |binary
ooo_custom_images/industrial/cmd/lc_beziercutline.png |binary
ooo_custom_images/industrial/cmd/lc_bezierdelete.png |binary
ooo_custom_images/industrial/cmd/lc_bezieredge.png|binary
ooo_custom_images/industrial/cmd/lc_bezierinsert.png |binary
ooo_custom_images/industrial/cmd/lc_beziermove.png|binary
ooo_custom_images/industrial/cmd/lc_beziersmooth.png |binary
ooo_custom_images/industrial/cmd/lc_beziersymmetric.png |binary
ooo_custom_images/industrial/cmd/sc_bezierclose.png |binary
ooo_custom_images/industrial/cmd/sc_bezierconvert.png |binary
ooo_custom_images/industrial/cmd/sc_beziercutline.png |binary
ooo_custom_images/industrial/cmd/sc_bezierdelete.png |binary
ooo_custom_images/industrial/cmd/sc_bezieredge.png|binary
ooo_custom_images/industrial/cmd/sc_beziereliminatepoints.png |binary
ooo_custom_images/industrial/cmd/sc_bezierinsert.png |binary
ooo_custom_images/industrial/cmd/sc_beziermove.png|binary
ooo_custom_images/industrial/cmd/sc_beziersmooth.png |binary
ooo_custom_images/industrial/cmd/sc_beziersymmetric.png |binary
ooo_custom_images/industrial/svx/res/cd016.png|binary
ooo_custom_images/industrial/svx/res/cd017.png|binary
ooo_custom_images/industrial/svx/res/cd018.png|binary
ooo_custom_images/industrial/svx/res/cropmarkers.png |binary
ooo_custom_images/industrial/svx/res/id031.png|binary
ooo_custom_images/industrial/svx/res/id032.png|binary
ooo_custom_images/industrial/svx/res/id033.png|binary
ooo_custom_images/industrial/svx/res/markers.png |binary
svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx |3
svx/inc/svx/svdhdl.hxx|8
svx/source/sdr/contact/viewcontactofsdrobj.cxx| 10 -
svx/source/sdr/primitive2d/sdrprimitivetools.cxx | 89 --
svx/source/svdraw/svddrgmt.cxx|5
svx/source/svdraw/svdhdl.cxx | 50 +++--
38 files changed, 39 insertions(+), 126 deletions(-)
New commits:
commit 8e95736e3a92292763ff7fe619bbd8de327c9c33
Author: Michael Meeks michael.me...@suse.com
Date: Fri Nov 18 16:35:06 2011 +
Use new glue-point creation code, makes glue-points visible themable
diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
index 8bd35f2..feadaf9 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
@@ -48,9 +48,6 @@ namespace drawinglayer
{
// create a 3x3 cross in given color as BitmapEx
BitmapEx createDefaultCross_3x3(const basegfx::BColor rBColor);
-
-// create a 7x7 gluepoint symbol in given colors as BitmapEx
-BitmapEx createDefaultGluepoint_7x7(const basegfx::BColor rBColorA,
const basegfx::BColor rBColorB);
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index a9069ce..4dbde6d 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -151,8 +151,7 @@ class SVX_DLLPUBLIC SdrHdl
friend classSdrMarkView; // fuer den Zugriff auf nObjHdlNum
friend classSdrHdlList;
-// #101928#
-BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd);
+static BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16
nInd);
protected:
SdrObject* pObj; // Gehoert das Handle zu einem
Objekt?
@@ -254,6 +253,9 @@ public:
virtual void onMouseLeave();
bool isMouseOver() const;
+
+static BitmapEx createGluePointBitmap() { return
ImpGetBitmapEx(Glue_Deselected, 0); }
+
};
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 1d83ee3..c9cce9d 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -42,7 +42,7 @@
#include svx/sdr/contact/objectcontactofpageview.hxx
#include svx/sdrpagewindow.hxx
#include svx/sdrpaintwindow.hxx
-#include
[Libreoffice-commits] .: src/xlsrecord.py
src/xlsrecord.py | 17 ++--- 1 file changed, 10 insertions(+), 7 deletions(-) New commits: commit f420f9653023b9fb427941c38ec929daf90e Author: Kohei Yoshida kohei.yosh...@suse.com Date: Fri Nov 18 11:42:54 2011 -0500 Read exactly 10 bytes in doper. I was reading 11 bytes for unknown type. diff --git a/src/xlsrecord.py b/src/xlsrecord.py index 2cdb224..6927836 100644 --- a/src/xlsrecord.py +++ b/src/xlsrecord.py @@ -396,7 +396,7 @@ class Autofilter(BaseRecordHandler): self.readBytes(6) # ignore 6 bytes else: doper = Autofilter.Doper() -self.readBytes(10) # ignore the entire 10 bytes +self.readBytes(9) # ignore the entire 10 bytes return doper def __parseBytes (self): @@ -414,16 +414,19 @@ class Autofilter(BaseRecordHandler): # pick up string(s) self.string1 = None -if self.doper1.dataType == Autofilter.DoperType.String: -self.string1 = self.readXLUnicodeStringNoCch(self.doper1.strLen) - self.string2 = None -if self.doper2.dataType == Autofilter.DoperType.String: -self.string2 = self.readXLUnicodeStringNoCch(self.doper2.strLen) +try: +if self.doper1.dataType == Autofilter.DoperType.String: +self.string1 = self.readXLUnicodeStringNoCch(self.doper1.strLen) + +if self.doper2.dataType == Autofilter.DoperType.String: +self.string2 = self.readXLUnicodeStringNoCch(self.doper2.strLen) +except: +pass def parseBytes (self): self.__parseBytes() -self.appendLine(filter index (= column ID): %d%self.filterIndex) +self.appendLine(filter index (relative column ID): %d%self.filterIndex) self.appendLine(joining: %s%self.getBoolVal(self.join, AND, OR)) self.appendLineBoolean(1st condition is simple equality, self.simple1) self.appendLineBoolean(2nd condition is simple equality, self.simple2) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: basctl/source officecfg/registry
basctl/source/basicide/linenumberwindow.cxx | 29
+
basctl/source/basicide/linenumberwindow.hxx | 30
+-
officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu |2
3 files changed, 57 insertions(+), 4 deletions(-)
New commits:
commit fd48c0eead825326ce1ee31d043185a79e7fa87f
Author: Noel Power noel.po...@novell.com
Date: Fri Nov 18 16:41:11 2011 +
add license info to linenumberwindow.[ch]xx, fix menu label
diff --git a/basctl/source/basicide/linenumberwindow.cxx
b/basctl/source/basicide/linenumberwindow.cxx
index 2f593e9..837e477 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -1,4 +1,30 @@
-/* -*- Mode: C++; eval:(c-set-style bsd); tab-width: 4; indent-tabs-mode:
nil; c-basic-offset: 4 -*- */
+/* -*- 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) 2011 August Sodora aug...@gmail.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.
+ */
#include baside2.hxx
#include linenumberwindow.hxx
@@ -106,3 +132,4 @@ int LineNumberWindow::GetWidth()
{
return m_nWidth;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/linenumberwindow.hxx
b/basctl/source/basicide/linenumberwindow.hxx
index 74b44be..39041b9 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -1,5 +1,30 @@
-/* -*- Mode: C++; eval:(c-set-style bsd); tab-width: 4; indent-tabs-mode:
nil; c-basic-offset: 4 -*- */
-
+/* -*- 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) 2011 August Sodora aug...@gmail.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.
+ */
#ifndef BASICIDE_LINENUMBERWINDOW_HXX
#define BASICIDE_LINENUMBERWINDOW_HXX
@@ -33,3 +58,4 @@ public:
};
#endif // BASICIDE_LINENUMBERWINDOW_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git
a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
index c711808..84e5c41 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDECommands.xcu
@@ -10,7 +10,7 @@
/node
node oor:name=.uno:ShowLines oor:op=replace
prop oor:name=Label oor:type=xs:string
- value xml:lang=en-USDisplay Source Line
Number.../value
+ value xml:lang=en-USDisplay Source Line Number/value
/prop
/node
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/source
sw/source/ui/uno/unotxdoc.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3bdce622e0847b769a8d0d6e7b5f6f5f8e1ef3c0
Author: Ivan Timofeev timofeev@gmail.com
Date: Fri Nov 18 22:14:38 2011 +0400
forgot to consider printing from html source
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 4a1ef26..53e047c 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -194,7 +194,7 @@ SwPrintUIOptions * lcl_GetPrintUIOptions(
SwPaM* pShellCrsr = pSh-GetCrsr();
nCurrentPage = pShellCrsr-GetPageNum(sal_True, 0);
}
-else
+else if (!bSwSrcView)
{
const SwPagePreView* pPreView = dynamic_cast const SwPagePreView*
(pView);
OSL_ENSURE(pPreView, Unexpected type of the view shell);
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 6 commits - sc/source
sc/source/ui/cctrl/checklistmenu.cxx | 30 +--
sc/source/ui/inc/checklistmenu.hxx | 15 ++-
sc/source/ui/inc/gridwin.hxx |5 -
sc/source/ui/view/gridwin.cxx| 142 +--
4 files changed, 124 insertions(+), 68 deletions(-)
New commits:
commit 43cab25e27f944fedae0e19eecd072914817016f
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Nov 18 16:20:24 2011 -0500
Get top10, empty and non-empty special queries to work.
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 884d5c6..cb351dc 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -757,7 +757,7 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode
eMode)
ScQueryParam aParam;
pDBData-GetQueryParam(aParam);
-if (mpAutoFilterPopup-isAllSelected())
+if (eMode == Normal mpAutoFilterPopup-isAllSelected())
{
// Remove this entry.
aParam.RemoveEntryByField(rPos.Col());
@@ -775,19 +775,42 @@ void
ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode)
pEntry-nField = rPos.Col();
pEntry-eConnect = SC_AND;
-ScCheckListMenuWindow::ResultType aResult;
-mpAutoFilterPopup-getResult(aResult);
-std::vectorrtl::OUString aSelected;
-ScCheckListMenuWindow::ResultType::const_iterator itr =
aResult.begin(), itrEnd = aResult.end();
-for (; itr != itrEnd; ++itr)
+switch (eMode)
{
-if (itr-second)
-aSelected.push_back(itr-first);
-}
+case Normal:
+{
+pEntry-eOp = SC_EQUAL;
+
+ScCheckListMenuWindow::ResultType aResult;
+mpAutoFilterPopup-getResult(aResult);
+std::vectorrtl::OUString aSelected;
+ScCheckListMenuWindow::ResultType::const_iterator itr =
aResult.begin(), itrEnd = aResult.end();
+for (; itr != itrEnd; ++itr)
+{
+if (itr-second)
+aSelected.push_back(itr-first);
+}
-ScQueryEntry::QueryItemsType rItems = pEntry-GetQueryItems();
-rItems.clear();
-std::for_each(aSelected.begin(), aSelected.end(),
AddItemToEntry(rItems));
+ScQueryEntry::QueryItemsType rItems = pEntry-GetQueryItems();
+rItems.clear();
+std::for_each(aSelected.begin(), aSelected.end(),
AddItemToEntry(rItems));
+}
+break;
+case Top10:
+pEntry-eOp = SC_TOPVAL;
+pEntry-GetQueryItem().meType = ScQueryEntry::ByString;
+pEntry-GetQueryItem().maString =
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(10));
+break;
+case Empty:
+pEntry-SetQueryByEmpty();
+break;
+case NonEmpty:
+pEntry-SetQueryByNonEmpty();
+break;
+default:
+// We don't know how to handle this!
+return;
+}
}
pViewData-GetView()-Query(aParam, NULL, true);
commit aaad72db3376f236ea49a755c39bac21c53a0704
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Nov 18 15:51:19 2011 -0500
Execute launching of standard filter dialog.
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index dd5e94f..884d5c6 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -744,6 +744,16 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode
eMode)
if (!pDBData)
return;
+if (eMode == Custom)
+{
+ScRange aRange;
+pDBData-GetArea(aRange);
+pViewData-GetView()-MarkRange(aRange);
+pViewData-GetView()-SetCursor(rPos.Col(), rPos.Row());
+pViewData-GetDispatcher().Execute(SID_FILTER,
SFX_CALLMODE_SLOT|SFX_CALLMODE_RECORD);
+return;
+}
+
ScQueryParam aParam;
pDBData-GetQueryParam(aParam);
commit 27434041afc8160ed81de83484e00c542e2b859a
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Nov 18 15:44:18 2011 -0500
We probably don't need to do this for the new popup.
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index e378a7f..dd5e94f 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -715,8 +715,6 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW
nRow)
mpAutoFilterPopup-addMenuItem(
ScResId::toString(ScResId(SCSTR_NOTEMPTY)), true, new
AutoFilterAction(this, NonEmpty));
-mpAutoFilterPopup-SetPopupModeEndHdl( LINK(this, ScGridWindow,
PopupModeEndHdl) );
-
mpAutoFilterPopup-launch(aCellRect);
}
commit e2aca79c0186b77e8eb7c4de7a0b35879584fee4
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Nov 18 15:40:12 2011 -0500
Register modes for non-standard autofiltering options.
diff --git
[Libreoffice-commits] .: 13 commits - idl/source solenv/gbuild sw/inc sw/source testtools/source xmlsecurity/source
idl/source/prj/database.cxx | 51 ---
solenv/gbuild/ComponentTarget.mk |1
sw/inc/doc.hxx |1
sw/source/core/crsr/swcrsr.cxx | 22 +
sw/source/core/doc/doc.cxx | 11
sw/source/core/doc/docedt.cxx|8 +++
sw/source/core/inc/sectfrm.hxx |2
sw/source/core/layout/newfrm.cxx |9 +++-
sw/source/core/layout/sectfrm.cxx| 22 -
sw/source/core/undo/unins.cxx| 12 +++--
sw/source/ui/uiview/viewsrch.cxx | 17 ++-
sw/source/ui/wrtsh/wrtundo.cxx |3 -
testtools/source/bridgetest/makefile.mk |9
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |2
14 files changed, 138 insertions(+), 32 deletions(-)
New commits:
commit 986ac894f4288fcbde35771793f332c5981abc27
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 18 18:55:47 2011 +0100
SwSectionFrm: s/sal_Bool/bool/
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 7966b8e..bc16e52 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -60,7 +60,7 @@ class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm
void CalcFtnAtEndFlag();
void CalcEndAtEndFlag();
const SwSectionFmt* _GetEndSectFmt() const;
-sal_Bool IsEndnoteAtMyEnd() const;
+bool IsEndnoteAtMyEnd() const;
protected:
virtual void MakeAll();
virtual sal_Bool ShouldBwdMoved( SwLayoutFrm *pNewUpper, sal_Bool bHead,
sal_Bool rReformat );
diff --git a/sw/source/core/layout/sectfrm.cxx
b/sw/source/core/layout/sectfrm.cxx
index 5091d5f..6f568f4 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2369,7 +2369,7 @@ void SwSectionFrm::CalcFtnAtEndFlag()
}
}
-sal_Bool SwSectionFrm::IsEndnoteAtMyEnd() const
+bool SwSectionFrm::IsEndnoteAtMyEnd() const
{
return pSection-GetFmt()-GetEndAtTxtEnd( sal_False ).IsAtEnd();
}
@@ -2469,13 +2469,13 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem
*pOld, const SfxPoolItem *pNew
} while ( pTmp );
aCol.Init( nCol, 0, 1000 );
}
-sal_Bool bChgFtn = IsFtnAtEnd();
-sal_Bool bChgEndn = IsEndnAtEnd();
-sal_Bool bChgMyEndn = IsEndnoteAtMyEnd();
+bool bChgFtn = IsFtnAtEnd();
+bool const bChgEndn = IsEndnAtEnd();
+bool const bChgMyEndn = IsEndnoteAtMyEnd();
CalcFtnAtEndFlag();
CalcEndAtEndFlag();
-bChgFtn = ( bChgFtn != (sal_Bool) IsFtnAtEnd() ) ||
- ( bChgEndn != (sal_Bool) IsEndnAtEnd() ) ||
+bChgFtn = ( bChgFtn != IsFtnAtEnd() ) ||
+ ( bChgEndn != IsEndnAtEnd() ) ||
( bChgMyEndn != IsEndnoteAtMyEnd() );
ChgColumns( aCol, rNewCol, bChgFtn );
rInvFlags |= 0x10;
@@ -2496,9 +2496,9 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem *pOld,
const SfxPoolItem *pNew
case RES_FTN_AT_TXTEND:
if( !IsInFtn() )
{
-sal_Bool bOld = IsFtnAtEnd();
+bool const bOld = IsFtnAtEnd();
CalcFtnAtEndFlag();
-if( bOld != (sal_Bool) IsFtnAtEnd() )
+if (bOld != IsFtnAtEnd())
{
const SwFmtCol rNewCol = GetFmt()-GetCol();
ChgColumns( rNewCol, rNewCol, sal_True );
@@ -2510,10 +2510,10 @@ void SwSectionFrm::_UpdateAttr( const SfxPoolItem
*pOld, const SfxPoolItem *pNew
case RES_END_AT_TXTEND:
if( !IsInFtn() )
{
-sal_Bool bOld = IsEndnAtEnd();
-sal_Bool bMyOld = IsEndnoteAtMyEnd();
+bool const bOld = IsEndnAtEnd();
+bool const bMyOld = IsEndnoteAtMyEnd();
CalcEndAtEndFlag();
-if( bOld != (sal_Bool) IsEndnAtEnd() || bMyOld !=
IsEndnoteAtMyEnd())
+if (bOld != IsEndnAtEnd() || bMyOld != IsEndnoteAtMyEnd())
{
const SwFmtCol rNewCol = GetFmt()-GetCol();
ChgColumns( rNewCol, rNewCol, sal_True );
commit eedfbf5b8b99049753f444ea71e0944a69dbc60c
Author: Michael Stahl mst...@redhat.com
Date: Fri Nov 18 17:14:04 2011 +0100
fdo#42865: let's try map file for windows only
diff --git a/testtools/source/bridgetest/makefile.mk
b/testtools/source/bridgetest/makefile.mk
index 8d2f21b..1423190 100644
--- a/testtools/source/bridgetest/makefile.mk
+++ b/testtools/source/bridgetest/makefile.mk
@@ -83,7 +83,11 @@ SHL1STDLIBS= \
SHL1LIBS= $(LIB1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def
DEF1NAME= $(SHL1TARGET)
+.IF
[Libreoffice-commits] .: 2 commits - sc/CppunitTest_sc_filters_test.mk sc/qa
sc/CppunitTest_sc_filters_test.mk |1
sc/qa/unit/macros-test.cxx| 47 --
2 files changed, 1 insertion(+), 47 deletions(-)
New commits:
commit b352f5357c95cf37ffa1debb1ffe62b84c223509
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Nov 18 22:48:20 2011 +0100
macros_test does not need to inherit from Filters-Test
diff --git a/sc/qa/unit/macros-test.cxx b/sc/qa/unit/macros-test.cxx
index 5250ae6..207c939 100644
--- a/sc/qa/unit/macros-test.cxx
+++ b/sc/qa/unit/macros-test.cxx
@@ -80,16 +80,11 @@ FileFormat aFileFormats[] = {
/* Implementation of Macros test */
-class ScMacrosTest
-: public test::FiltersTest
-, public test::BootstrapFixture
+class ScMacrosTest : public test::BootstrapFixture
{
public:
ScMacrosTest();
-virtual bool load(const rtl::OUString rFilter, const rtl::OUString rURL,
const rtl::OUString rUserData);
-ScDocShellRef load(const rtl::OUString rFilter, const rtl::OUString rURL,
-const rtl::OUString rUserData, const rtl::OUString rTypeName,
sal_uLong nFormatType=0);
uno::Reference com::sun::star::lang::XComponent loadFromDesktop(const
rtl::OUString rURL);
void createFileURL(const rtl::OUString aFileBase, const rtl::OUString
aFileExtension, rtl::OUString rFilePath);
@@ -115,35 +110,6 @@ private:
::rtl::OUString m_aBaseString;
};
-ScDocShellRef ScMacrosTest::load(const rtl::OUString rFilter, const
rtl::OUString rURL,
-const rtl::OUString rUserData, const rtl::OUString rTypeName, sal_uLong
nFormatType)
-{
-sal_uInt32 nFormat = 0;
-if (nFormatType)
-nFormat = SFX_FILTER_IMPORT | SFX_FILTER_USESOPTIONS;
-SfxFilter* aFilter = new SfxFilter(
-rFilter,
-rtl::OUString(), nFormatType, nFormat, rTypeName, 0, rtl::OUString(),
-rUserData,
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(private:factory/scalc*)) );
-aFilter-SetVersion(SOFFICE_FILEFORMAT_CURRENT);
-
-ScDocShellRef xDocShRef = new ScDocShell;
-SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READWRITE, true);
-pSrcMed-SetFilter(aFilter);
-if (!xDocShRef-DoLoad(pSrcMed))
-{
-xDocShRef-DoClose();
-// load failed.
-xDocShRef.Clear();
-}
-else if (nFormatType)
-{
-pSrcMed-GetItemSet()-Put( SfxUInt16Item( SID_MACROEXECMODE,
document::MacroExecMode::ALWAYS_EXECUTE_NO_WARN ));
-SfxObjectShell::SetCurrentComponent( xDocShRef-GetModel() );
-}
-
-return xDocShRef;
-}
uno::Reference com::sun::star::lang::XComponent
ScMacrosTest::loadFromDesktop(const rtl::OUString rURL)
{
@@ -161,17 +127,6 @@ uno::Reference com::sun::star::lang::XComponent
ScMacrosTest::loadFromDesktop
}
-bool ScMacrosTest::load(const rtl::OUString rFilter, const rtl::OUString
rURL,
-const rtl::OUString rUserData)
-{
-ScDocShellRef xDocShRef = load(rFilter, rURL, rUserData, rtl::OUString());
-bool bLoaded = xDocShRef.Is();
-//reference counting of ScDocShellRef is very confused.
-if (bLoaded)
-xDocShRef-DoClose();
-return bLoaded;
-}
-
void ScMacrosTest::createFileURL(const rtl::OUString aFileBase, const
rtl::OUString aFileExtension, rtl::OUString rFilePath)
{
rtl::OUString aSep(RTL_CONSTASCII_USTRINGPARAM(/));
commit 67f8ddd3a071a901838c8fec01ff79b553c05f29
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Fri Nov 18 22:48:13 2011 +0100
basic component is no longer needed in filters-test
diff --git a/sc/CppunitTest_sc_filters_test.mk
b/sc/CppunitTest_sc_filters_test.mk
index 3051ef8..4aeaad7 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -89,7 +89,6 @@ $(eval $(call gb_CppunitTest_add_type_rdbs,sc_filters_test,\
))
$(eval $(call gb_CppunitTest_add_components,sc_filters_test,\
-basic/util/sb \
chart2/source/controller/chartcontroller \
chart2/source/tools/charttools \
chart2/source/model/chartmodel \
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/cctrl/checklistmenu.cxx | 20 +++-
sc/source/ui/inc/checklistmenu.hxx | 11 +++
sc/source/ui/view/gridwin.cxx|3 +++
3 files changed, 33 insertions(+), 1 deletion(-)
New commits:
commit 898c527481059017c8f75ba51bfc80b297f0480d
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Nov 18 16:56:10 2011 -0500
Disable the OK button when no items are selected.
When filtering by equality, we need to have at least one value to
compare to, or else bad things may happen.
The pivot table OTOH can handle empty set. So over there, it's okay
to allow no items to be selected.
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index 3835ab9..e96e6d4 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -747,6 +747,11 @@ void ScMenuFloatingWindow::terminateAllPopupMenus()
//
+ScCheckListMenuWindow::Config::Config() :
+mbAllowEmptySet(true)
+{
+}
+
ScCheckListMenuWindow::Member::Member() :
mbVisible(true)
{
@@ -958,7 +963,11 @@ void ScCheckListMenuWindow::setAllMemberState(bool bSet)
{
size_t n = maMembers.size();
for (size_t i = 0; i n; ++i)
-maChecks.CheckEntryPos(static_cast sal_uInt16 ( i ), bSet);
+maChecks.CheckEntryPos(static_castsal_uInt16(i), bSet);
+
+if (!maConfig.mbAllowEmptySet)
+// We need to have at least one member selected.
+maBtnOk.Enable(maChecks.GetCheckedEntryCount() != 0);
}
void ScCheckListMenuWindow::selectCurrentMemberOnly(bool bSet)
@@ -1047,6 +1056,10 @@ IMPL_LINK( ScCheckListMenuWindow, CheckHdl,
SvTreeListBox*, pChecks )
else
maChkToggleAll.SetState(STATE_DONTKNOW);
+if (!maConfig.mbAllowEmptySet)
+// We need to have at least one member selected.
+maBtnOk.Enable(nNumChecked != 0);
+
mePrevToggleAllState = maChkToggleAll.GetState();
return 0;
}
@@ -1177,6 +1190,11 @@ void ScCheckListMenuWindow::initMembers()
}
}
+void ScCheckListMenuWindow::setConfig(const Config rConfig)
+{
+maConfig = rConfig;
+}
+
const Size ScCheckListMenuWindow::getWindowSize() const
{
return maWndSize;
diff --git a/sc/source/ui/inc/checklistmenu.hxx
b/sc/source/ui/inc/checklistmenu.hxx
index 34b3be7..4a1458a 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -216,6 +216,15 @@ public:
*/
struct ExtendedData {};
+/**
+ * Configuration options for this popup window.
+ */
+struct Config
+{
+bool mbAllowEmptySet;
+Config();
+};
+
explicit ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc);
virtual ~ScCheckListMenuWindow();
@@ -228,6 +237,7 @@ public:
void setMemberSize(size_t n);
void addMember(const ::rtl::OUString rName, bool bVisible);
void initMembers();
+void setConfig(const Config rConfig);
const Size getWindowSize() const;
@@ -318,6 +328,7 @@ private:
boost::scoped_ptrAction mpOKAction;
boost::scoped_ptrAction mpPopupEndAction;
+Config maConfig;
Size maWndSize; /// whole window size.
Size maMenuSize; /// size of all menu items combined.
TriState mePrevToggleAllState;
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index cb351dc..b533a82 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -715,6 +715,9 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW
nRow)
mpAutoFilterPopup-addMenuItem(
ScResId::toString(ScResId(SCSTR_NOTEMPTY)), true, new
AutoFilterAction(this, NonEmpty));
+ScCheckListMenuWindow::Config aConfig;
+aConfig.mbAllowEmptySet = false;
+mpAutoFilterPopup-setConfig(aConfig);
mpAutoFilterPopup-launch(aCellRect);
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: writerfilter/source
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 10 -- writerfilter/source/rtftok/rtfdocumentimpl.hxx |5 - 2 files changed, 15 deletions(-) New commits: commit 59a0064c2a195368379c5816640737e787550207 Author: Miklos Vajna vmik...@frugalware.org Date: Fri Nov 18 23:43:12 2011 +0100 RTFDocumentImpl: remove 15 unused includes diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index a0a5a76..ffc3846 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -26,39 +26,29 @@ */ #include com/sun/star/beans/PropertyAttribute.hpp -#include com/sun/star/beans/PropertyValues.hpp #include com/sun/star/document/XDocumentPropertiesSupplier.hpp -#include com/sun/star/graphic/XGraphic.hpp #include com/sun/star/graphic/XGraphicProvider.hpp #include com/sun/star/io/UnexpectedEOFException.hpp -#include com/sun/star/util/DateTime.hpp #include com/sun/star/text/XTextFrame.hpp #include com/sun/star/text/SizeType.hpp #include com/sun/star/text/HoriOrientation.hpp #include com/sun/star/text/VertOrientation.hpp #include com/sun/star/text/RelOrientation.hpp #include editeng/borderline.hxx -#include rtl/strbuf.hxx -#include rtl/ustrbuf.hxx #include rtl/tencinfo.h #include svl/lngmisc.hxx #include unotools/ucbstreamhelper.hxx #include unotools/streamwrap.hxx #include com/sun/star/drawing/XDrawPageSupplier.hpp -#include com/sun/star/drawing/XDrawPage.hpp #include doctok/sprmids.hxx // NS_sprm namespace #include doctok/resourceids.hxx // NS_rtf namespace #include ooxml/resourceids.hxx // NS_ooxml namespace #include ooxml/OOXMLFastTokens.hxx // ooxml namespace -#include rtfdocumentimpl.hxx #include rtfsdrimport.hxx #include rtftokenizer.hxx #include rtfcharsets.hxx -#include rtfcontrolwords.hxx -#include rtfvalue.hxx -#include rtfsprm.hxx #include rtfreferenceproperties.hxx #include rtfskipdestination.hxx #include rtffly.hxx diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx index 35098b2..ef33359 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx @@ -28,21 +28,16 @@ #ifndef _RTFDOCUMENTIMPL_HXX_ #define _RTFDOCUMENTIMPL_HXX_ -#include memory #include stack -#include vector #include queue #include com/sun/star/lang/XMultiServiceFactory.hpp #include com/sun/star/beans/XPropertySet.hpp #include com/sun/star/document/XDocumentProperties.hpp #include oox/helper/graphichelper.hxx -#include oox/helper/storagebase.hxx #include rtl/strbuf.hxx -#include resourcemodel/WW8ResourceModel.hxx #include rtftok/RTFDocument.hxx -#include rtfcontrolwords.hxx #include rtfreferencetable.hxx #include rtfsprm.hxx ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in set_soenv.in solenv/bin
configure.in | 18 ++
set_soenv.in |1 +
solenv/bin/modules/installer/windows/property.pm | 13 +
3 files changed, 32 insertions(+)
New commits:
commit 949ee7c30806357a5e7fc678c7bbf53f991c71e8
Author: Andras Timar ati...@suse.com
Date: Fri Nov 18 23:40:08 2011 +0100
add --enable-silent-msi configure switch
On Windows it is now configurable to create an MSI installer
which installs LibreOffice without user interaction.
diff --git a/configure.in b/configure.in
index 995..b50da2e 100644
--- a/configure.in
+++ b/configure.in
@@ -806,6 +806,11 @@ AC_ARG_ENABLE(release-build,
See http://wiki.documentfoundation.org/DevBuild]),
,)
+AC_ARG_ENABLE(silent-msi,
+AS_HELP_STRING([--enable-silent-msi],
+[Enable MSI with LIMITUI=1 (silent install).]),
+,)
+
dnl ===
dnl Optional Packages (--with/without-)
dnl ===
@@ -8459,6 +8464,19 @@ fi
AC_SUBST(ENABLE_RELEASE_BUILD)
dnl ===
+dnl Test whether to create MSI with LIMITUI=1 (silent install)
+dnl ===
+AC_MSG_CHECKING([whether to create MSI with LIMITUI=1 (silent install)])
+if test z$enable_silent_msi = z -o z$enable_silent_msi = zno ; then
+AC_MSG_RESULT([no])
+ENABLE_SILENT_MSI=FALSE
+else
+AC_MSG_RESULT([yes])
+ENABLE_SILENT_MSI=TRUE
+fi
+AC_SUBST(ENABLE_SILENT_MSI)
+
+dnl ===
dnl Test whether to enable ActiveX embedding
dnl ===
if test $_os = WINNT; then
diff --git a/set_soenv.in b/set_soenv.in
index 7a265eb..abf12db 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1869,6 +1869,7 @@ ToFile( VERBOSE, @VERBOSE@, e );
ToFile( ENABLE_ZENITY, @ENABLE_ZENITY@, e );
ToFile( ENABLE_EVOAB2, @ENABLE_EVOAB2@,e );
ToFile( ENABLE_UGLY, @ENABLE_UGLY@, e );
+ToFile( ENABLE_SILENT_MSI, @ENABLE_SILENT_MSI@, e );
ToFile( ENABLE_RELEASE_BUILD, @ENABLE_RELEASE_BUILD@, e );
ToFile( GOBJECT_CFLAGS,@GOBJECT_CFLAGS@, e );
ToFile( GOBJECT_LIBS, @GOBJECT_LIBS@, e );
diff --git a/solenv/bin/modules/installer/windows/property.pm
b/solenv/bin/modules/installer/windows/property.pm
index b7aa5ca..ee33596 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -480,6 +480,8 @@ sub update_property_table
my $propertyfile = installer::files::read_file($properyfilename);
+my $hasarpnomodify = false;
+
# Getting the new values
# Some values (arpcomments, arpcontacts, ...) are inserted from the
Property.mlf
@@ -504,6 +506,17 @@ sub update_property_table
${$propertyfile}[$i] =~ s/\bPRODUCTNAMETEMPLATE\b/$productname/;
${$propertyfile}[$i] =~ s/\bPRODUCTVERSIONTEMPLATE\b/$productversion/;
${$propertyfile}[$i] =~
s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/;
+if ( ${$propertyfile}[$i] =~ m/\bARPNOMODIFY\b/ ) { $hasarpnomodify =
true; }
+}
+
+# Check if are building silent MSI
+if ( $ENV{ENABLE_SILENT_MSI} eq TRUE )
+{
+push(@{$propertyfile}, LIMITUI . \t . 1 . \n);
+if ( !($hasarpnomodify) )
+{
+push(@{$propertyfile}, ARPNOMODIFY . \t . 1 . \n);
+}
}
# Setting variables into propertytable
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: configure.in
configure.in |5 - 1 file changed, 5 deletions(-) New commits: commit a738b25f7caff2a5ed789668e1ab0bf29bf5082f Author: Tomas Chvatal tchva...@suse.cz Date: Sat Nov 19 00:00:47 2011 +0100 Remove layout from configure opts (does nothing now). diff --git a/configure.in b/configure.in index b50da2e..0043bdb 100644 --- a/configure.in +++ b/configure.in @@ -633,11 +633,6 @@ AC_ARG_ENABLE(static-gtk, instead of the dynamic ones. (Enables -Bstatic linker flag for GTK+ libraries.)]), ,) -AC_ARG_ENABLE(layout, -AS_HELP_STRING([--enable-layout], -[Enable the compilation and use of layout dialogs.]), -,) - AC_ARG_ENABLE(build-mozilla, AS_HELP_STRING([--disable-build-mozilla], [Use this option if you do not want to build the Mozilla components from ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 3 commits - sal/osl unotest/prj unotest/source
sal/osl/android/Makefile | 73 ++-
sal/osl/android/build.xml | 29 +
sal/osl/android/jni/lo-bootstrap.c | 240 -
sal/osl/android/jni/lo-bootstrap.h |3
sal/osl/android/src/org/libreoffice/android/Bootstrap.java | 38 +-
sal/osl/unx/file.cxx | 99 -
unotest/prj/d.lst |1
unotest/source/cpp/unoexceptionprotector/makefile.mk |7
8 files changed, 426 insertions(+), 64 deletions(-)
New commits:
commit 552f521070bf5ff4e031206968463cd99061edc5
Author: Tor Lillqvist tlillqv...@suse.com
Date: Sat Nov 19 02:47:22 2011 +0200
Add read-only pseudo-files representing a memory block
For Android only for now. To be used to read raw asset files from the
application package (.apk file, a zip archive).
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index d57820b..7a36e69 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -79,6 +79,12 @@ struct FileHandle_Impl
rtl_String *m_strFilePath; /* holds native file path */
int m_fd;
+enum Kind
+{
+KIND_FD = 1,
+KIND_MEM = 2
+};
+int m_kind;
/** State
*/
enum StateBits
@@ -242,6 +248,7 @@ FileHandle_Impl::Guard::~Guard()
FileHandle_Impl::FileHandle_Impl (int fd, char const * path)
: m_strFilePath (0),
m_fd (fd),
+ m_kind(KIND_FD),
m_state (STATE_SEEKABLE | STATE_READABLE),
m_size(0),
m_offset (0),
@@ -356,6 +363,24 @@ oslFileError FileHandle_Impl::readAt (
if (!(m_state STATE_READABLE))
return osl_File_E_BADF;
+if (m_kind == KIND_MEM)
+{
+ssize_t nBytes;
+
+m_offset = nOffset;
+
+if ((sal_uInt64) m_offset = m_size)
+nBytes = 0;
+else
+{
+nBytes = std::min(nBytesRequested, (size_t) (m_size - m_offset));
+memmove(pBuffer, m_buffer + m_offset, nBytes);
+m_offset += nBytes;
+}
+*pBytesRead = nBytes;
+return osl_File_E_None;
+}
+
#if defined(LINUX) || defined(SOLARIS)
ssize_t nBytes = ::pread (m_fd, pBuffer, nBytesRequested, nOffset);
@@ -449,7 +474,7 @@ oslFileError FileHandle_Impl::readFileAt (
*pBytesRead = nBytes;
return osl_File_E_None;
}
-else if (0 == m_buffer)
+else if (m_kind == KIND_MEM || 0 == m_buffer)
{
// not buffered
return readAt (nOffset, pBuffer, nBytesRequested, pBytesRead);
@@ -825,6 +850,34 @@ static int osl_file_queryLocking (sal_uInt32 uFlags)
return 0;
}
+#ifdef ANDROID
+
+static oslFileError
+SAL_CALL osl_openMemoryAsFile( void *address, size_t size, oslFileHandle
*pHandle )
+{
+oslFileError eRet;
+FileHandle_Impl * pImpl = new FileHandle_Impl (-1, );
+if (!pImpl)
+{
+eRet = oslTranslateFileError (OSL_FET_ERROR, ENOMEM);
+return eRet;
+}
+pImpl-m_kind = FileHandle_Impl::KIND_MEM;
+pImpl-m_size = sal::static_int_cast sal_uInt64 (size);
+
+*pHandle = (oslFileHandle)(pImpl);
+
+pImpl-m_bufptr = 0;
+pImpl-m_buflen = size;
+
+pImpl-m_bufsiz = size;
+pImpl-m_buffer = (sal_uInt8*) address;
+
+return osl_File_E_None;
+}
+
+#endif
+
/
* osl_openFile
***/
@@ -854,6 +907,21 @@ SAL_CALL osl_openFile( rtl_uString* ustrFileURL,
oslFileHandle* pHandle, sal_uIn
return oslTranslateFileError (OSL_FET_ERROR, errno);
#endif /* MACOSX */
+#ifdef ANDROID
+/* Opening a file from /assets read-only means
+ * we should mmap it from the .apk file
+ */
+if (!(uFlags osl_File_OpenFlag_Write)
+strncmp (buffer, /assets/, strlen (/assets/)) == 0)
+{
+void *address;
+size_t size;
+void *(*lo_apkentry)(const char *, size_t *) = (void *(*)(const char
*, size_t *)) dlsym(RTLD_DEFAULT, lo_apkentry);
+address = (*lo_apkentry)(buffer, size);
+return osl_openMemoryAsFile(address, size, pHandle);
+}
+#endif
+
/* set mode and flags */
int mode = S_IRUSR | S_IRGRP | S_IROTH;
int flags = O_RDONLY;
@@ -976,6 +1044,12 @@ SAL_CALL osl_closeFile( oslFileHandle Handle )
{
FileHandle_Impl* pImpl = static_castFileHandle_Impl*(Handle);
+if (pImpl-m_kind == FileHandle_Impl::KIND_MEM)
+{
+delete pImpl;
+return osl_File_E_None;
+}
+
if ((pImpl == 0) || (pImpl-m_fd 0))
return osl_File_E_INVAL;
@@ -1008,6 +1082,9 @@ SAL_CALL osl_syncFile(oslFileHandle Handle)
{
FileHandle_Impl* pImpl = static_castFileHandle_Impl*(Handle);
+if (pImpl-m_kind == FileHandle_Impl::KIND_MEM)
+return osl_File_E_None;
+
if
[Libreoffice-commits] Changes to 'refs/remotes/origin/master'
___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sc/source
sc/source/ui/cctrl/checklistmenu.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit ac4b051e3247ccc9dfc40ca0699537ce4256de35
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Nov 18 21:38:09 2011 -0500
Check the empty set state after launching.
Sometimes we get empty set especially when all rows are filtered out.
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index e96e6d4..9b23197 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1220,6 +1220,10 @@ void ScCheckListMenuWindow::getResult(ResultType
rResult)
void ScCheckListMenuWindow::launch(const Rectangle rRect)
{
packWindow();
+if (!maConfig.mbAllowEmptySet)
+// We need to have at least one member selected.
+maBtnOk.Enable(maChecks.GetCheckedEntryCount() != 0);
+
StartPopupMode(rRect, (FLOATWIN_POPUPMODE_DOWN |
FLOATWIN_POPUPMODE_GRABFOCUS));
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'refs/remotes/origin/master' - sc/source
sc/source/ui/cctrl/checklistmenu.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit ac4b051e3247ccc9dfc40ca0699537ce4256de35
Author: Kohei Yoshida kohei.yosh...@suse.com
Date: Fri Nov 18 21:38:09 2011 -0500
Check the empty set state after launching.
Sometimes we get empty set especially when all rows are filtered out.
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx
b/sc/source/ui/cctrl/checklistmenu.cxx
index e96e6d4..9b23197 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1220,6 +1220,10 @@ void ScCheckListMenuWindow::getResult(ResultType
rResult)
void ScCheckListMenuWindow::launch(const Rectangle rRect)
{
packWindow();
+if (!maConfig.mbAllowEmptySet)
+// We need to have at least one member selected.
+maBtnOk.Enable(maChecks.GetCheckedEntryCount() != 0);
+
StartPopupMode(rRect, (FLOATWIN_POPUPMODE_DOWN |
FLOATWIN_POPUPMODE_GRABFOCUS));
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: 2 commits - basic/source
basic/source/comp/scanner.cxx | 39 +++
basic/source/inc/scanner.hxx |2 ++
2 files changed, 21 insertions(+), 20 deletions(-)
New commits:
commit 76f4712c7d1382752edfc153e3879fb447e70db5
Author: August Sodora aug...@gmail.com
Date: Fri Nov 18 21:35:01 2011 -0500
Remove uses of pLine in scanner
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 2b594de..09e96bc 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -163,21 +163,17 @@ inline bool lclIsWhitespace( sal_Unicode cChar )
void SbiScanner::scanGoto()
{
-const sal_Unicode* pTestLine = pLine;
short nTestCol = nCol;
-while( lclIsWhitespace( *pTestLine ) )
-{
-pTestLine++;
+while(nTestCol aLine.getLength() lclIsWhitespace(aLine[nTestCol]))
nTestCol++;
-}
-if( *pTestLine *(pTestLine + 1) )
+if(nTestCol + 1 aLine.getLength())
{
-String aTestSym = aLine.copy( nTestCol, 2 );
-if( aTestSym.EqualsIgnoreCaseAscii( to ) )
+::rtl::OUString aTestSym = aLine.copy(nTestCol, 2);
+
if(aTestSym.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM(to)))
{
-aSym = String::CreateFromAscii( goto );
-pLine = pTestLine + 2;
+aSym = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(goto));
+pLine = pLine + (nCol - nTestCol) + 2;
nCol = nTestCol + 2;
}
}
commit 53a662f53055ea5f262d7e0358d1346bab7f353d
Author: August Sodora aug...@gmail.com
Date: Fri Nov 18 21:27:44 2011 -0500
Refactoring in scanner
diff --git a/basic/source/comp/scanner.cxx b/basic/source/comp/scanner.cxx
index 5d1f36b..2b594de 100644
--- a/basic/source/comp/scanner.cxx
+++ b/basic/source/comp/scanner.cxx
@@ -161,6 +161,28 @@ inline bool lclIsWhitespace( sal_Unicode cChar )
} // namespace
+void SbiScanner::scanGoto()
+{
+const sal_Unicode* pTestLine = pLine;
+short nTestCol = nCol;
+while( lclIsWhitespace( *pTestLine ) )
+{
+pTestLine++;
+nTestCol++;
+}
+
+if( *pTestLine *(pTestLine + 1) )
+{
+String aTestSym = aLine.copy( nTestCol, 2 );
+if( aTestSym.EqualsIgnoreCaseAscii( to ) )
+{
+aSym = String::CreateFromAscii( goto );
+pLine = pTestLine + 2;
+nCol = nTestCol + 2;
+}
+}
+}
+
bool SbiScanner::NextSym()
{
// memorize for the EOLN-case
@@ -240,26 +262,7 @@ bool SbiScanner::NextSym()
// Special handling for go to
if( bCompatible *pLine aSym.equalsIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM(go) ) )
-{
-const sal_Unicode* pTestLine = pLine;
-short nTestCol = nCol;
-while( lclIsWhitespace( *pTestLine ) )
-{
-pTestLine++;
-nTestCol++;
-}
-
-if( *pTestLine *(pTestLine + 1) )
-{
-String aTestSym = aLine.copy( nTestCol, 2 );
-if( aTestSym.EqualsIgnoreCaseAscii( to ) )
-{
-aSym = String::CreateFromAscii( goto );
-pLine = pTestLine + 2;
-nCol = nTestCol + 2;
-}
-}
-}
+scanGoto();
// replace closing '_' by space when end of line is following
// (wrong line continuation otherwise)
diff --git a/basic/source/inc/scanner.hxx b/basic/source/inc/scanner.hxx
index c96387e..e98ebc3 100644
--- a/basic/source/inc/scanner.hxx
+++ b/basic/source/inc/scanner.hxx
@@ -45,6 +45,8 @@ class SbiScanner
::rtl::OUString aLine;
const sal_Unicode* pLine;
const sal_Unicode* pSaveLine;
+
+void scanGoto();
protected:
::rtl::OUString aSym;
String aError;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
