New feature in Calc: Stepped Lines graphs
Hello everyone, in order to scratch my own itch, I started working on a stepped lines feature for XY graphs (and Line graphs) in Calc. See bugzilla 61135. This is my first coding in LO :-) Next steps would be to expose this functionality in the UI and check that it would be saved and read in the file format. However, before spending more time, I would like to know about the following: - can we just add a new type of graph ? Don't we have to follow the ODF 1.2 specification ? - if I add this, what about compatibility with older LO/OOo versions and other spreadsheets using ODF (Gnumeric, KOffice, ...) ? - how to handle UI changes ? Can I create a patch/proposal independently ? Thanks for the answers, Eric ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
moz module gbuildification?
All, According to https://wiki.documentfoundation.org/Development/Build_System/Module_status moz should not be converted to gbuild. However, moz still seems to be used for the windows addressbook connectivity. Since we’re down to only 2-3 gbuild modules, can somebody tell me if it’s worth the time to convert moz or is it really going to be removed soon? Thanks, Peter___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/viewer/mediawindow.cxx |7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 5fb8aa777445d4bf150172459fe8f2581a35d854
Author: Joel Madero jmadero@gmail.com
Date: Tue Feb 19 17:01:33 2013 -0800
fdo#36635 Added WMV/WMA/AAC to list of Movie and Sound File Types
WMV, WMA and AAC are all supported but were not listed in movie and sound
file types (Insert - Movie and Sound...) so they would not appear in
file browser unless you chose Show All Files. Added these to list
modified: avmedia/source/viewer/mediawindow.cxx
Change-Id: I459b41a1ca647d7a90cec75436438097df5df962
Reviewed-on: https://gerrit.libreoffice.org/2287
Reviewed-by: Andras Timar ati...@suse.com
Tested-by: Andras Timar ati...@suse.com
diff --git a/avmedia/source/viewer/mediawindow.cxx
b/avmedia/source/viewer/mediawindow.cxx
index f2dec68..574fa76 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -212,7 +212,8 @@ Window* MediaWindow::getWindow() const
void MediaWindow::getMediaFilters( FilterNameVector rFilterNameVector )
{
-static const char* pFilters[] = { AIF Audio, aif;aiff,
+static const char* pFilters[] = { Advanced Audio Coding, aac,
+ AIF Audio, aif;aiff,
AU Audio, au,
AVI, avi,
CD Audio, cda,
@@ -225,7 +226,9 @@ void MediaWindow::getMediaFilters( FilterNameVector
rFilterNameVector )
Quicktime Video, mov,
Vivo Video, viv,
WAVE Audio, wav,
- WebM Video, webm };
+ WebM Video, webm,
+ Windows Media Audio, wma,
+ Windows Media Video, wmv};
for( size_t i = 0; i SAL_N_ELEMENTS(pFilters); i += 2 )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Switching to 4.0 Branch
Hi Joel, I've made a couple simple patches for 4.1 master but see no reason why they can't be in 4.0.1 when it's released. How do I go about changing branch and then resubmitting patch for 4.0 (and then of course go back to 4.1 master). Once they are in master, you can do: git log # note the sha1 of the commits you want to submit to 4-0 git branch libreoffice-4-0 origin/libreoffice-4-0 # create the branch, possibly you need logerrit/, not origin/ git checkout libreoffice-4-0 git cherry-pick -x sha1 # for each change # build and runtime-test git push libreoffice-4-0:refs/for/libreoffice-4-0 git checkout master # go back to master More here: https://wiki.documentfoundation.org/Development/gerrit/SubmitPatch Please make sure you only cherry-pick bugfixes, feature commits should be master-only. Hope this helps, Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Regression - LO Writer 4.0
Hi Raymond, On Tue, Feb 19, 2013 at 05:56:22PM -0800, r_ouellette ray.ouelle...@sympatico.ca wrote: When I read bibisect use, they talk about a single digit version, 3.6 against 3.6.any and not 4.0 against 3.6... I don't want to install something heavy for nothing :-( Just to clear the myth, bibisect is about testing master, so it's the opposite: you can use for testing 3.6 vs 4.0, but (for the currently published binary repo) it's not usable for 3.6.x vs 3.6.y. So it's exactly what you can use. :-) Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/data/cell-btlr.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 62 +++
2 files changed, 62 insertions(+)
New commits:
commit 39dd9b64ddb0afefab88c8d6627c9f9c13b4ed37
Author: Miklos Vajna vmik...@suse.cz
Date: Tue Feb 19 21:03:48 2013 +0100
testcase for 349e9248f801d23735478abafe5328f79dfe4378
Change-Id: I27ca3b21427cb4d6e6b54ae5f0b3b86e18b550a2
diff --git a/sw/qa/extras/ooxmlexport/data/cell-btlr.docx
b/sw/qa/extras/ooxmlexport/data/cell-btlr.docx
new file mode 100644
index 000..f05f114
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/cell-btlr.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d39489a..433160f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -41,8 +41,13 @@
#include com/sun/star/text/XPageCursor.hpp
#include unotools/tempfile.hxx
+#include unotools/ucbstreamhelper.hxx
+#include rtl/strbuf.hxx
#include swmodeltestbase.hxx
+#include libxml/xpathInternals.h
+#include libxml/parserInternals.h
+
class Test : public SwModelTestBase
{
public:
@@ -74,6 +79,7 @@ public:
void testTextFrames();
void testTextFrameBorders();
void testTextframeGradient();
+void testCellBtlr();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) !defined(WNT)
@@ -116,6 +122,7 @@ void Test::run()
{textframes.odt, Test::testTextFrames},
{textframe-borders.docx, Test::testTextFrameBorders},
{textframe-gradient.docx, Test::testTextframeGradient},
+{cell-btlr.docx, Test::testCellBtlr},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -564,6 +571,61 @@ void Test::testTextframeGradient()
CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aGradient.Style);
}
+void Test::testCellBtlr()
+{
+/*
+ * The problem was that the exporter didn't mirror the workaround of the
+ * importer, regarding the btLr text direction: the w:textDirection
+ * w:val=btLr/ token was completely missing in the output.
+ *
+ * Given that this doesn't affect the result in the importer, we test the
+ * resulting file directly, by opening the zip file, parsing an xml stream,
+ * and asserting an XPath expression. This can be extracted to a helper
+ * method, once it's clear what is common in such tests.
+ */
+
+// Create the zip file.
+utl::TempFile aTempFile;
+aTempFile.EnableKillingFile();
+uno::Referenceframe::XStorable xStorable(mxComponent, uno::UNO_QUERY);
+uno::Sequencebeans::PropertyValue aFilterArgs(1);
+aFilterArgs[0].Name = FilterName;
+aFilterArgs[0].Value = OUString(Office Open XML Text);
+xStorable-storeToURL(aTempFile.GetURL(), aFilterArgs);
+
+// Read the XML stream we're interested in.
+uno::Sequenceuno::Any aArgs(1);
+aArgs[0] = OUString(aTempFile.GetURL());
+uno::Referencecontainer::XNameAccess
xNameAccess(m_xSFactory-createInstanceWithArguments(com.sun.star.packages.zip.ZipFileAccess,
aArgs), uno::UNO_QUERY);
+uno::Referenceio::XInputStream
xInputStream(xNameAccess-getByName(word/document.xml), uno::UNO_QUERY);
+boost::shared_ptrSvStream
pStream(utl::UcbStreamHelper::CreateStream(xInputStream, sal_True));
+pStream-Seek(STREAM_SEEK_TO_END);
+sal_Size nSize = pStream-Tell();
+pStream-Seek(0);
+OStringBuffer aDocument(nSize);
+char ch;
+for (sal_Size i = 0; i nSize; ++i)
+{
+*pStream ch;
+aDocument.append(ch);
+}
+
+// Parse the XML.
+xmlDocPtr pXmlDoc = xmlParseMemory((const char*)aDocument.getStr(),
aDocument.getLength());
+
+// Assert the XPath expression.
+xmlXPathContextPtr pXmlXpathCtx = xmlXPathNewContext(pXmlDoc);
+xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST(w),
BAD_CAST(http://schemas.openxmlformats.org/wordprocessingml/2006/main;));
+OString aXPath =
/w:document/w:body/w:tbl/w:tr/w:tc/w:tcPr/w:textDirection;
+xmlXPathObjectPtr pXmlXpathObj =
xmlXPathEvalExpression(BAD_CAST(aXPath.getStr()), pXmlXpathCtx);
+xmlNodeSetPtr pXmlNodes = pXmlXpathObj-nodesetval;
+CPPUNIT_ASSERT_EQUAL(1, xmlXPathNodeSetGetLength(pXmlNodes));
+xmlNodePtr pXmlNode = pXmlNodes-nodeTab[0];
+OString aAttribute = val;
+OUString aValue = OUString::createFromAscii((const
char*)xmlGetProp(pXmlNode, BAD_CAST(aAttribute.getStr(;
+CPPUNIT_ASSERT_EQUAL(OUString(btLr), aValue);
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: stoc/source
stoc/source/inspect/introspection.cxx | 42 +-
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit a633a96c3a50d803e5fa43b603edc0b8e2e34b6e
Author: Stefan Schick stinde...@googlemail.com
Date: Tue Feb 19 23:20:05 2013 +0100
Translated comments from german to english
Change-Id: Ibe383f8a9c630fdccfe7718880acb78a4298220e
diff --git a/stoc/source/inspect/introspection.cxx
b/stoc/source/inspect/introspection.cxx
index ea62d4d..beb0b0a 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -84,11 +84,11 @@ typedef WeakImplHelper3 XIntrospectionAccess,
XMaterialHolder, XExactName Int
//==
-// Spezial-Wert fuer Method-Concept, um normale Funktionen kennzeichnen zu
koennen
+// Special value for Method-Concept, to be able to mark normal functions
#define MethodConcept_NORMAL_IMPL0x8000
-// Methode zur Feststellung, ob eine Klasse von einer anderen abgeleitet ist
+// Method to assert, if a class is derived from another class
sal_Bool isDerivedFrom( ReferenceXIdlClass xToTestClass,
ReferenceXIdlClass xDerivedFromClass )
{
Sequence ReferenceXIdlClass aClassesSeq =
xToTestClass-getSuperclasses();
@@ -110,18 +110,18 @@ sal_Bool isDerivedFrom( ReferenceXIdlClass
xToTestClass, ReferenceXIdlClass
//
-// *** Klassifizierung der Properties (kein enum, um Sequence verwenden zu
koennen) ***
-// Properties aus einem PropertySet-Interface
+// *** Classification of Properties (no enum, to be able to use Sequence) ***
+// Properties from a PropertySet-Interface
#define MAP_PROPERTY_SET0
-// Properties aus Fields
+// Properties from Fields
#define MAP_FIELD1
-// Properties, die durch get/set-Methoden beschrieben werden
+// Properties, that get described with get/set-Methods
#define MAP_GETSET2
-// Properties, die nur eine set-Methode haben
+// Properties, with only a set-Method
#define MAP_SETONLY3
-// Schrittweite, in der die Groesse der Sequences angepasst wird
+// Increments, in which the size of Sequences get adjusted
#define ARRAY_SIZE_STEP20
@@ -129,10 +129,10 @@ sal_Bool isDerivedFrom( ReferenceXIdlClass
xToTestClass, ReferenceXIdlClass
//**
//*** IntrospectionAccessStatic_Impl ***
//**
-// Entspricht dem alten IntrospectionAccessImpl, bildet jetzt den statischen
-// Anteil des neuen Instanz-bezogenen ImplIntrospectionAccess
+// Equals to the old IntrospectionAccessImpl, forms now a static
+// part of the new Instance-related ImplIntrospectionAccess
-// Hashtable fuer die Suche nach Namen
+// Hashtable for the search of names
struct hashName_Impl
{
size_t operator()(const ::rtl::OUString Str) const
@@ -159,8 +159,8 @@ typedef boost::unordered_map
IntrospectionNameMap;
-// Hashtable zur Zuordnung der exakten Namen zu den zu Lower-Case
-// konvertierten Namen, dient zur Unterst�tzung von XExactName
+// Hashtable to assign exact names to the Lower-Case
+// converted names, for the support of XExactName
typedef boost::unordered_map
::rtl::OUString,
@@ -177,29 +177,29 @@ class IntrospectionAccessStatic_Impl: public
salhelper::SimpleReferenceObject
friend class ImplIntrospection;
friend class ImplIntrospectionAccess;
-// CoreReflection halten
+// Holding CoreReflection
Reference XIdlReflection mxCoreReflection;
-// InterfaceSequences, um Zusatz-Infos zu einer Property speichern zu
koennen.
-// z.B. das Field bei MAP_FIELD, die get/set-Methoden bei MAP_GETSET usw.
+// InterfaceSequences, to save additional information in a property
+// for example the Field at MAP_FIELD, the get/set-Methods at MAP_GETSET,
et cetera
Sequence ReferenceXInterface aInterfaceSeq1;
Sequence ReferenceXInterface aInterfaceSeq2;
-// Hashtables fuer die Namen
+// Hashtables for names
IntrospectionNameMap maPropertyNameMap;
IntrospectionNameMap maMethodNameMap;
LowerToExactNameMap maLowerToExactNameMap;
-// Sequence aller Properties, auch zum Liefern aus getProperties()
+// Sequence of all Properties, also for delivering from getProperties()
SequenceProperty maAllPropertySeq;
-// Mapping der Properties auf Zugriffs-Arten
+// Mapping of properties to Access-Types
Sequencesal_Int16 maMapTypeSeq;
-// Klassifizierung der gefundenen Methoden
+// Classification of found methods
Sequencesal_Int32 maPropertyConceptSeq;
-// Anzahl der Properties
+// Number of Properties
sal_Int32 mnPropCount;
// Anzahl der Properties, die den jeweiligen Konzepten zugeordnet sind
___
Libreoffice-commits mailing
Re: [PUSHED] Translated comments from german to english
Hi Stefan, On Tue, Feb 19, 2013 at 11:20:05PM +0100, Stefan Schick stinde...@googlemail.com wrote: All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license. Thanks, pushed! Miklos signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: New feature in Calc: Stepped Lines graphs
Hi Eric, Eric Seynaeve schrieb: Hello everyone, in order to scratch my own itch, I started working on a stepped lines feature for XY graphs (and Line graphs) in Calc. See bugzilla 61135 https://bugs.freedesktop.org/show_bug.cgi?id=61135. This is my first coding in LO :-) you are welcome. Next steps would be to expose this functionality in the UI and check that it would be saved and read in the file format. However, before spending more time, I would like to know about the following: - can we just add a new type of graph ? Don't we have to follow the ODF 1.2 specification ? The specification is not written in a way, that some people image cool new features, but they look, what existing programs do. And those things which are common are standardized. Therefore LO has ODF1.2 extended and Gnumeric with foreign elements. In Gnumeric I see an interpolation with stepped lines. Is it that, what you want to get? If yes, then I would not implement them as new chart type in LO, but use the same way as in Gnumeric and make it a new kind of interpolation. There exists already a request for ODF1.3 to specify such interpolation. If LO will implement them too, it will become more likely, that they will be specified in ODF1.3. - if I add this, what about compatibility with older LO/OOo versions and other spreadsheets using ODF (Gnumeric, KOffice, ...) ? - how to handle UI changes ? Can I create a patch/proposal independently ? Applications, which support ODF but do not know special elements or attributes, ignore such elements or attributes. If you will make the stepped lines an interpolation in an XY-chart, those applications would only show the points of the chart but not the interpolating lines. Kind regards Regina ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/qa sw/source writerfilter/source
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 17 ++
sw/source/core/unocore/unotext.cxx |9 +
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 46 -
writerfilter/source/dmapper/DomainMapperTableManager.cxx |9 -
writerfilter/source/dmapper/DomainMapperTableManager.hxx |4
writerfilter/source/dmapper/TablePositionHandler.cxx | 117 ++-
writerfilter/source/dmapper/TablePositionHandler.hxx | 14 +
writerfilter/source/ooxml/model.xml |9 -
8 files changed, 167 insertions(+), 58 deletions(-)
New commits:
commit d0cde9640b52ccfbb28ed1f65bba0927afd7b69b
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed Feb 20 11:04:16 2013 +0100
n#779642: Fixed floating tables import in writerfilter
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index ce07b6f..eec5e70 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1164,8 +1164,23 @@ void Test::testN793998()
void Test::testN779642()
{
uno::Referencetext::XTextTablesSupplier xTextTablesSupplier(mxComponent,
uno::UNO_QUERY);
+
+// First problem: check that we have 2 tables, nesting caused the
+// creation of outer one to fail
uno::Referencecontainer::XIndexAccess
xTables(xTextTablesSupplier-getTextTables(), uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables-getCount());
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong number of imported tables,
sal_Int32(2), xTables-getCount());
+
+// Second problem: check that the outer table is in a frame, at the bottom
of the page
+uno::Referencetext::XTextTable
xTextTable(xTextTablesSupplier-getTextTables()-getByName(Table2),
uno::UNO_QUERY);
+uno::Referencebeans::XPropertySet xAnchor(xTextTable-getAnchor(),
uno::UNO_QUERY);
+uno::Any aFrame = xAnchor-getPropertyValue(TextFrame);
+uno::Referencebeans::XPropertySet xFrame;
+aFrame = xFrame;
+sal_Int16 nValue;
+xFrame-getPropertyValue(VertOrient) = nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong vertical orientation, nValue,
text::VertOrientation::BOTTOM);
+xFrame-getPropertyValue(VertOrientRelation) = nValue;
+CPPUNIT_ASSERT_EQUAL_MESSAGE(Wrong vertical orientation relation,
nValue, text::RelOrientation::PAGE_PRINT_AREA);
}
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index b9581ed..9651d91 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1623,7 +1623,14 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
// remove the addtional paragraphs in the end
if (pStartStartNode-GetStartNodeType() == SwTableBoxStartNode)
{
-SwTableNode *const
pStartTableNode(pStartStartNode-FindTableNode());
+SwTableNode * pStartTableNode(pStartStartNode-FindTableNode());
+// Is it the same table start node than the end?
+SwTableNode *const
pEndStartTableNode(pEndStartNode-FindTableNode());
+while (pEndStartTableNode-GetIndex()
pStartTableNode-GetIndex())
+{
+SwStartNode* pStartStartTableNode =
pStartTableNode-StartOfSectionNode();
+pStartTableNode = pStartStartTableNode-FindTableNode();
+}
const SwNodeIndex aTblIdx( *pStartTableNode, -1 );
SwPosition aBefore(aTblIdx);
bParaBeforeInserted = GetDoc()-AppendTxtNode( aBefore );
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 46c418d..6f1a400 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -717,7 +717,8 @@ void DomainMapperTableHandler::endTable(unsigned int
nestedTableLevel)
uno::Referencetext::XTextRange xStart;
uno::Referencetext::XTextRange xEnd;
// If we want to make this table a floating one.
-bool bFloating =
!m_rDMapper_Impl.getTableManager().getTableVertAnchor().isEmpty();
+uno::Sequencebeans::PropertyValue aFrameProperties =
m_rDMapper_Impl.getTableManager().getTablePosition();
+bool bFloating = aFrameProperties.hasElements();
// Additional checks: if we can do this.
if (bFloating (*m_pTableSeq)[0].getLength() 0
(*m_pTableSeq)[0][0].getLength() 0)
{
@@ -764,46 +765,11 @@ void DomainMapperTableHandler::endTable(unsigned int
nestedTableLevel)
if (xTable.is() xStart.is() xEnd.is())
{
uno::Referencebeans::XPropertySet xTableProperties(xTable,
uno::UNO_QUERY);
-uno::Sequence beans::PropertyValue aFrameProperties(16);
-beans::PropertyValue* pFrameProperties =
aFrameProperties.getArray();
-
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde4/KDE4FilePicker.cxx |8 ++--
vcl/unx/kde4/KDE4FilePicker.hxx | 19 +++
2 files changed, 13 insertions(+), 14 deletions(-)
New commits:
commit 82e951c26af28ad58b380a97acaf7aa446714b05
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 20 12:05:24 2013 +0100
KDE4FilePicker: un-break build
Change-Id: Id41a0f4bc7db04f343a50ff23080a616abbbd6c6
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index 951ea8b..6b3e1a9 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -105,12 +105,8 @@ QString toQString(const rtl::OUString s)
//
KDE4FilePicker::KDE4FilePicker( const uno::Referenceuno::XComponentContext )
-: cppu::WeakComponentImplHelper4
- XFilePicker2,
- XFilePicker3,
- XFilePickerControlAccess,
- lang::XServiceInfo( _helperMutex ),
- _resMgr( ResMgr::CreateResMgr(fps_office) )
+: KDE4FilePicker_Base(_helperMutex)
+, _resMgr( ResMgr::CreateResMgr(fps_office) )
{
_extraControls = new QWidget();
_layout = new QGridLayout(_extraControls);
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 7db8e81..1170f96 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -42,14 +42,17 @@ class QLayout;
class ResMgr;
-class KDE4FilePicker :
-public cppu::WeakComponentImplHelper5
-::com::sun::star::ui::dialogs::XFilePicker2,
-::com::sun::star::ui::dialogs::XFilePicker3,
-::com::sun::star::ui::dialogs::XFilePickerControlAccess,
-// TODO ::com::sun::star::ui::dialogs::XFilePreview,
-::com::sun::star::lang::XInitialization,
-::com::sun::star::lang::XServiceInfo
+typedef ::cppu::WeakComponentImplHelper5
+ ::com::sun::star::ui::dialogs::XFilePicker2
+, ::com::sun::star::ui::dialogs::XFilePicker3
+, ::com::sun::star::ui::dialogs::XFilePickerControlAccess
+// TODO ::com::sun::star::ui::dialogs::XFilePreview
+, ::com::sun::star::lang::XInitialization
+, ::com::sun::star::lang::XServiceInfo
+ KDE4FilePicker_Base;
+
+class KDE4FilePicker
+: public KDE4FilePicker_Base
{
protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde/UnxFilePicker.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 585adde4341ecc7d59dc86aa0e24ecbddfa5787f Author: Stephan Bergmann sberg...@redhat.com Date: Wed Feb 20 12:13:49 2013 +0100 fixup Change-Id: Idefe8c963d1579443dbce311ecd57f4311085840 diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index 422e00d..0145d4c 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -87,11 +87,12 @@ namespace // UnxFilePicker::UnxFilePicker( const uno::Referenceuno::XComponentContext ) -: cppu::WeakComponentImplHelper4 +: cppu::WeakComponentImplHelper5 // TODO XFilePreview, XFilePicker2, XFilePicker3, XFilePickerControlAccess, + lang::XInitialization, lang::XServiceInfo( m_rbHelperMtx ), m_nFilePickerPid( -1 ), m_nFilePickerWrite( -1 ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 28287fcfeee5a50a90f6690b752aefea1f0a695b Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Wed Feb 20 12:15:19 2013 +0100 trying to fix the external/external visio/wpd build - unfortunately not reproducable here, so commiting into the blind Change-Id: I8af27d2230f43cb6aeae17234e339e2bf747bde3 diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index aed173b..af3aad1 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1312,7 +1312,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef define gb_ExternalProject__use_wpd -$(call gb_ExternalProject_use_package,$(1),libwpd) +$(call gb_ExternalProject_use_external_project,$(1),libwpd) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/unx
vcl/unx/kde/UnxFilePicker.cxx |8 +---
vcl/unx/kde/UnxFilePicker.hxx | 10 ++
2 files changed, 7 insertions(+), 11 deletions(-)
New commits:
commit f3ceb0be8805657a3b886509ac255128a11b5974
Author: Noel Grandin n...@peralex.com
Date: Wed Feb 20 13:43:03 2013 +0200
fixup class vs. constructor definition
Change-Id: Idab639141a989bc9752df67b083a5d6e1e01ac37
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index 0145d4c..2bd096a 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -87,13 +87,7 @@ namespace
//
UnxFilePicker::UnxFilePicker( const uno::Referenceuno::XComponentContext )
-: cppu::WeakComponentImplHelper5
-// TODO XFilePreview,
- XFilePicker2,
- XFilePicker3,
- XFilePickerControlAccess,
- lang::XInitialization,
- lang::XServiceInfo( m_rbHelperMtx ),
+: UnxFilePicker_Base( m_rbHelperMtx ),
m_nFilePickerPid( -1 ),
m_nFilePickerWrite( -1 ),
m_nFilePickerRead( -1 ),
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index 37ba21c..afc5b6c 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -45,15 +45,17 @@ protected:
osl::Mutex m_rbHelperMtx;
};
-class UnxFilePicker :
-public UnxFilePickerDummy,
-public cppu::WeakComponentImplHelper5
+typedef ::cppu::WeakComponentImplHelper5
::com::sun::star::ui::dialogs::XFilePicker2,
::com::sun::star::ui::dialogs::XFilePicker3,
::com::sun::star::ui::dialogs::XFilePickerControlAccess,
// TODO ::com::sun::star::ui::dialogs::XFilePreview,
::com::sun::star::lang::XInitialization,
-::com::sun::star::lang::XServiceInfo
+::com::sun::star::lang::XServiceInfo UnxFilePicker_Base;
+
+class UnxFilePicker :
+public UnxFilePickerDummy,
+public UnxFilePicker_Base
{
protected:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: moz module gbuildification?
On 02/20/2013 03:16 AM, Peter Foley wrote: According to https://wiki.documentfoundation.org/Development/Build_System/Module_status moz should not be converted to gbuild. However, moz still seems to be used for the windows addressbook connectivity. Since we’re down to only 2-3 gbuild modules, can somebody tell me if it’s worth the time to convert moz or is it really going to be removed soon? https://bugs.freedesktop.org/show_bug.cgi?id=56902 Kill off in-tree (ancient) mozilla copy still blocks on three issues all in status NEW * https://bugs.freedesktop.org/show_bug.cgi?id=56903 Moz-free Outlook Address Book driver * https://bugs.freedesktop.org/show_bug.cgi?id=56905 Moz-free Outlook Express Address Book driver * https://bugs.freedesktop.org/show_bug.cgi?id=57322 Moz-free LDAP Address Book driver So my take is that it would be worthwhile nevertheless to get moz converted to gbuild now, and see dmake/build.pl removed soon. (Peter, once there are no more modules left for conversion, maybe you'd be interested in working on one of the above issues instead? ;) Stephan ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: config_host.mk.in configure.ac mysqlc/Extension_mysql-connector-ooo.mk
config_host.mk.in |1 + configure.ac|1 + mysqlc/Extension_mysql-connector-ooo.mk |2 +- 3 files changed, 3 insertions(+), 1 deletion(-) New commits: commit 74a920c59ff7a68f5d42b3b9188ef8aeff28eda1 Author: David Tardon dtar...@redhat.com Date: Wed Feb 20 12:42:50 2013 +0100 fdo#60907 export libmysql file name' Change-Id: I294301e0f87924ac89c16c99f0549c98a7ea7da5 diff --git a/config_host.mk.in b/config_host.mk.in index a40d361..9ebf1c6 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -303,6 +303,7 @@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@ export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@ export LIBLOADER_JAR=@LIBLOADER_JAR@ export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@ +export LIBMYSQL=@LIBMYSQL@ export LIBMYSQL_PATH=@LIBMYSQL_PATH@ export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@ export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@ diff --git a/configure.ac b/configure.ac index 6fad25a..b0eea19 100644 --- a/configure.ac +++ b/configure.ac @@ -7816,6 +7816,7 @@ if test $ENABLE_MYSQLC = YES; then AC_SUBST(MYSQL_INC) AC_SUBST(MYSQL_LIB) AC_SUBST(MYSQL_DEFINES) +AC_SUBST([LIBMYSQL]) AC_SUBST(LIBMYSQL_PATH) AC_LANG_PUSH([C++]) diff --git a/mysqlc/Extension_mysql-connector-ooo.mk b/mysqlc/Extension_mysql-connector-ooo.mk index ad94a2f..7da474c 100644 --- a/mysqlc/Extension_mysql-connector-ooo.mk +++ b/mysqlc/Extension_mysql-connector-ooo.mk @@ -26,7 +26,7 @@ endif # HACK: comes from Library_mysql.mk ifeq ($(SYSTEM_MYSQL),NO) $(eval $(call gb_Extension_add_files,mysql-connector-ooo,,\ - $(LIBMYSQL_PATH)/lib/$(MYSQL_LIBFILE) \ + $(LIBMYSQL_PATH)/lib/$(LIBMYSQL) \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - configure.ac m4/libo_check_extension.m4 m4/libo_externals.m4
configure.ac | 22 +-
m4/libo_check_extension.m4 |5 +++--
m4/libo_externals.m4 |7 +--
3 files changed, 13 insertions(+), 21 deletions(-)
New commits:
commit 722c84c136f972f42717ac12a3be5ce2a6510bcd
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 20 13:18:25 2013 +0100
m4: replace silly makefile modelines
Change-Id: I148941dfbf3c9c75cd07148b08646e85887846e1
diff --git a/m4/libo_check_extension.m4 b/m4/libo_check_extension.m4
index 9d5a59a..4443660 100644
--- a/m4/libo_check_extension.m4
+++ b/m4/libo_check_extension.m4
@@ -1,4 +1,4 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102
-*-
#
# This file is part of the LibreOffice project.
#
@@ -20,4 +20,5 @@ else
fi
AC_SUBST($2_EXTENSION_PACK)
])
-# vim: set noet sw=4 ts=4:
+
+dnl vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4
index 2b142b5..d522541 100644
--- a/m4/libo_externals.m4
+++ b/m4/libo_externals.m4
@@ -1,4 +1,4 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102
-*-
#
# This file is part of the LibreOffice project.
#
@@ -29,4 +29,5 @@ else
fi
libo_PUBLISH_MODULE([$2])
])
-# vim: set noet sw=4 ts=4:
+
+dnl vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 039a1dcc9fe2af4d48bd931a4c937d502a046797
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 20 13:15:23 2013 +0100
configure: fix WPD/WPS/WPG when no explicit option given:
Consistently set WPD_CFLAGS/WPD_LIBS etc. in that case, with luck not
breaking anything else in the process due to newly set FOO_CFLAGS/LIBS.
Change-Id: I56bc6b86821b77c0c376d06b629646ada1ea0339
diff --git a/configure.ac b/configure.ac
index ffdd3ee..97365f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7287,11 +7287,7 @@ dnl
===
if test $_os = iOS; then
libo_PUBLISH_MODULE([WPD])
else
-if test $with_system_libwpd = no; then
-WPD_CFLAGS=-I${OUTDIR}/inc/external
-WPD_LIBS=-L${OUTDIR}/lib -lwpdlib
-fi
-libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9])
+libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9
libwpd-stream-0.9],[-I${OUTDIR}/inc/external],[-L${OUTDIR}/lib -lwpdlib])
fi
dnl ===
@@ -7337,11 +7333,7 @@ dnl
===
if test $_os = iOS; then
libo_PUBLISH_MODULE([WPS])
else
-if test $with_system_libwps = no; then
-WPS_CFLAGS=-I${OUTDIR}/inc/external
-WPS_LIBS=-L${OUTDIR}/lib -lwpslib
-fi
-libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2])
+
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],[-I${OUTDIR}/inc/external],[-L${OUTDIR}/lib
-lwpslib])
fi
dnl ===
@@ -7350,11 +7342,7 @@ dnl
===
if test $_os = iOS; then
libo_PUBLISH_MODULE([WPG])
else
-if test $with_system_libwpg = no; then
-WPG_CFLAGS=-I${OUTDIR}/inc/external
-WPG_LIBS=-L${OUTDIR}/lib -lwpglib
-fi
-libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2])
+
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2],[-I${OUTDIR}/inc/external],[-L${OUTDIR}/lib
-lwpglib])
fi
dnl ===
diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4
index b0b45ed..2b142b5 100644
--- a/m4/libo_externals.m4
+++ b/m4/libo_externals.m4
@@ -23,6 +23,8 @@ if test $with_system_$1 = yes; then
else
AC_MSG_RESULT([internal])
SYSTEM_$2=NO
+$2_CFLAGS=$4
+$2_LIBS=$5
BUILD_TYPE=$BUILD_TYPE $2
fi
libo_PUBLISH_MODULE([$2])
commit e0202de07e9cf078011d580aacebf98bae58782d
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 20 13:02:04 2013 +0100
configure: typos
Change-Id: I73ffb627bea34f039af009794fab30b01987
diff --git a/configure.ac b/configure.ac
index b0eea19..ffdd3ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7195,7 +7195,7 @@ dnl Check for system clucene
dnl ===
dnl we should rather be using
dnl libo_CHECK_SYSTEM_MODULE([clucence],[CLUCENE],[liblucence-core]) here
-dnl but the contibs-lib check seems tricky
+dnl but the contribs-lib check seems tricky
AC_MSG_CHECKING([which clucene to use])
if test $with_system_clucene = yes; then
AC_MSG_RESULT([external])
@@ -7348,7 +7348,7 @@ dnl
===
dnl Check for system libwpg
dnl ===
if test
Re: Bug 34465 - get rid of all calls to virtual const SfxPoolItem* Put( const SfxPoolItem, USHORT nWhich)
Hi Bjoern,
2012/11/30 Bjoern Michaelsen bjoern.michael...@canonical.com
Yes, there are quite a few evil cornercases lurking there. Before changing
those conditionals, I think it is a good idea to just add assertions that
make
sure these assumptions are kept consistent all the time. A start would be
to
check that when an item is put in the set, to check:
- If it has a non-zero Which-Id
- and is not a SfxVoidItem
any client code that does something different (even explicitly putting a
SfxVoidItem), is abusing the API and should be fixed by making it call
DisableItem instead). Once you are sure that is cleaned up, one can
carefully
go on about changing the conditions. Some care is still needed as in
theory,
someone might have e.g. put a non-zero, non-SfxVoidItem and later set the
WhichId on the item to 0.
after a break I found sometime to hack :)
There is one place where SfxVoidItem is used instead of DisableItem
function.:
http://opengrok.libreoffice.org/xref/core/editeng/source/editeng/eerdll.cxx#150
SfxPoolItem** GlobalEditData::GetDefItems()
{
if ( !ppDefItems )
{
ppDefItems = new SfxPoolItem*[EDITITEMCOUNT];
// Paragraph attributes:
SvxNumRule aTmpNumRule( 0, 0, sal_False );
ppDefItems[0] = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP,
EE_PARA_WRITINGDIR );
ppDefItems[1] = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS );
ppDefItems[2] = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION,
sal_False );
ppDefItems[3] = new SfxBoolItem( EE_PARA_FORBIDDENRULES, sal_True
);
...
ppDefItems[17] = new SvxVerJustifyItem( SVX_VER_JUSTIFY_STANDARD,
EE_PARA_VER_JUST );
// Character attributes:
ppDefItems[18] = new SvxColorItem( Color( COL_AUTO ),
EE_CHAR_COLOR );
ppDefItems[19] = new SvxFontItem( EE_CHAR_FONTINFO );
...
ppDefItems[38] = new SvxFontHeightItem( 240, 100,
EE_CHAR_FONTHEIGHT_CTL );
ppDefItems[39] = new SvxWeightItem( WEIGHT_NORMAL,
EE_CHAR_WEIGHT_CJK );
ppDefItems[40] = new SvxWeightItem( WEIGHT_NORMAL,
EE_CHAR_WEIGHT_CTL );
ppDefItems[41] = new SvxPostureItem( ITALIC_NONE,
EE_CHAR_ITALIC_CJK );
ppDefItems[42] = new SvxPostureItem( ITALIC_NONE,
EE_CHAR_ITALIC_CTL );
ppDefItems[43] = new SvxEmphasisMarkItem( EMPHASISMARK_NONE,
EE_CHAR_EMPHASISMARK );
ppDefItems[44] = new SvxCharReliefItem( RELIEF_NONE,
EE_CHAR_RELIEF );
ppDefItems[45] = new SfxVoidItem( EE_CHAR_RUBI_DUMMY );
ppDefItems[46] = new SvXMLAttrContainerItem( EE_CHAR_XMLATTRIBS );
ppDefItems[47] = new SvxOverlineItem( UNDERLINE_NONE,
EE_CHAR_OVERLINE );
// Features
ppDefItems[48] = new SfxVoidItem( EE_FEATURE_TAB );
ppDefItems[49] = new SfxVoidItem( EE_FEATURE_LINEBR );
ppDefItems[50] = new SvxCharSetColorItem( Color( COL_RED ),
RTL_TEXTENCODING_DONTKNOW, EE_FEATURE_NOTCONV );
ppDefItems[51] = new SvxFieldItem( SvxFieldData(),
EE_FEATURE_FIELD );
DBG_ASSERT( EDITITEMCOUNT == 52, ITEMCOUNT geaendert, DefItems
nicht angepasst! );
// Init DefFonts:
GetDefaultFonts( *(SvxFontItem*)ppDefItems[EE_CHAR_FONTINFO -
EE_ITEMS_START],
*(SvxFontItem*)ppDefItems[EE_CHAR_FONTINFO_CJK -
EE_ITEMS_START],
*(SvxFontItem*)ppDefItems[EE_CHAR_FONTINFO_CTL -
EE_ITEMS_START] );
}
return ppDefItems;
}
What about this? Changing to SvxColorItem crashes
CppunitTest_sw_subsequent_odfexport on
Program received signal SIGSEGV, Segmentation fault.
0x45c4f134 in CharAttribList::InsertAttrib (this=0x8676b60, pAttrib=0x0) at
/home/maciej/programowanie/libreoffice/libo-working/editeng/source/editeng/editdoc.cxx:2661
2661const sal_uInt16 nStart = pAttrib-GetStart(); // may be better
for Comp.Opt.
#0 0x45c4f134 in CharAttribList::InsertAttrib (this=0x8676b60,
pAttrib=0x0) at
/home/maciej/programowanie/libreoffice/libo-working/editeng/source/editeng/editdoc.cxx:2661
#1 0x45c4e7d3 in EditDoc::InsertAttrib (this=0x86766a0, rPoolItem=...,
pNode=0x8676b40, nStart=0, nEnd=0) at
/home/maciej/programowanie/libreoffice/libo-working/editeng/source/editeng/editdoc.cxx:2473
#2 0x45c4e9fb in EditDoc::InsertAttrib (this=0x86766a0, pNode=0x8676b40,
nStart=0, nEnd=0, rPoolItem=...) at
/home/maciej/programowanie/libreoffice/libo-working/editeng/source/editeng/editdoc.cxx:2515
#3 0x45d07e44 in ImpEditEngine::SetAttribs (this=0x8676630, aSel=...,
rSet=..., nSpecial=1 '\001') at
/home/maciej/programowanie/libreoffice/libo-working/editeng/source/editeng/impedit5.cxx:551
because based on ItemState it should be disabled and never go beyond #3.
This shows that Item EE_CHAR_RUBI_DUMMY (4036) is by default disabled, and
never explicitly with DisableItem function.
Thanks in advance for any help/advice
Best Regards,
Maciek
___
LibreOffice mailing list
Re: New feature in Calc: Stepped Lines graphs
Hi Eric, Regina Henschel píše v St 20. 02. 2013 v 11:09 +0100: in order to scratch my own itch, I started working on a stepped lines feature for XY graphs (and Line graphs) in Calc. See bugzilla 61135 https://bugs.freedesktop.org/show_bug.cgi?id=61135. This is my first coding in LO :-) This is extremely cool, thanks for that! - and nice code too :-) - how to handle UI changes ? Can I create a patch/proposal independently ? Applications, which support ODF but do not know special elements or attributes, ignore such elements or attributes. If you will make the stepped lines an interpolation in an XY-chart, those applications would only show the points of the chart but not the interpolating lines. If you meant UI changes in the dialog, you can do them part of your patch, or separate, whatever you prefer. If you want to have user experience input on the changes, the best is to involve the guys at libreoffice-ux-adv...@lists.freedesktop.org, either to check what you have already done, or to work with them on the design. Please let us know when you have finalized the patch by sending a [PATCH] mail to this ML, or via gerrit. And of course, should you have any questions, just ask, or reach us at the IRC (#libreoffice-dev at irc.freenode.net). Thank you, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: RepositoryExternal.mk
RepositoryExternal.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c8d064df25b4c78e9201c2f12883ff631304eb13 Author: Michael Stahl mst...@redhat.com Date: Wed Feb 20 14:14:30 2013 +0100 Revert trying to fix the external/external visio/wpd build This reverts commit 28287fcfeee5a50a90f6690b752aefea1f0a695b. Need to depend on the package, which has a dependency on the project itself. diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index af3aad1..aed173b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1312,7 +1312,7 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef define gb_ExternalProject__use_wpd -$(call gb_ExternalProject_use_external_project,$(1),libwpd) +$(call gb_ExternalProject_use_package,$(1),libwpd) endef ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - cui/source helpcontent2
cui/source/inc/helpid.hrc |1 - helpcontent2 |2 +- 2 files changed, 1 insertion(+), 2 deletions(-) New commits: commit 7d7c1e7fcf33167e6608e5f8b5c2376b3a172b58 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 20 13:07:30 2013 + drop unused hid Change-Id: Ife098c39997dad8568f004ad623e9001fc4f3a87 diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 782605e..e1084a1 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -24,7 +24,6 @@ // Help-Ids -- #define HID_OPTIONS_SAVE CUI_HID_OPTIONS_SAVE -#define HID_OPTIONS_GENERAL CUI_HID_OPTIONS_GENERAL #define HID_OPTIONS_LINGU CUI_HID_OPTIONS_LINGU #define HID_OPTIONS_DICT_NEW CUI_HID_OPTIONS_DICT_NEW #define HID_OPTIONS_DICT_EDIT CUI_HID_OPTIONS_DICT_EDIT commit cac91feccb17d7105157040a28483fde5354e9e1 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 20 13:18:29 2013 + Updated core Project: help bf70fe53f234c712ff047607b186a4687acf8675 diff --git a/helpcontent2 b/helpcontent2 index a97475f..bf70fe5 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit a97475f929677fa26b59ecabe30ecbfa7159a521 +Subproject commit bf70fe53f234c712ff047607b186a4687acf8675 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
helpers/help_hid.lst | 21 - source/text/shared/optionen/01010100.xhp | 72 --- 2 files changed, 39 insertions(+), 54 deletions(-) New commits: commit bf70fe53f234c712ff047607b186a4687acf8675 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 20 13:18:29 2013 + update help ids for user info options page Change-Id: Ifa0de4fda8956fb664ce622485e23b08336fec54 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 9811343..2ba7ce5 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -2684,7 +2684,6 @@ HID_OPTIONS_CTL,39880, HID_OPTIONS_DICT_EDIT,33815, HID_OPTIONS_DICT_EDIT_ENTRIES_LIST,39896, HID_OPTIONS_DICT_NEW,33814, -HID_OPTIONS_GENERAL,33811, HID_OPTIONS_GRID,33816, HID_OPTIONS_JAVA_CLASSPATH,3, HID_OPTIONS_JAVA_PARAMETER,39998, @@ -7531,7 +7530,6 @@ svx_CheckBox_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS,809256156, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710, svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709, svx_CheckBox_RID_SFXDLG_NEWDICT_BTN_EXCEPT,1270400014, -svx_CheckBox_RID_SFXPAGE_GENERAL_CB_USEDATA,733496360, svx_CheckBox_RID_SFXPAGE_SAVE_BTN_AUTOSAVE,733479952, svx_CheckBox_RID_SFXPAGE_SAVE_BTN_BACKUP,733479951, svx_CheckBox_RID_SFXPAGE_SAVE_BTN_DOCINFO,733479950, @@ -7685,25 +7683,6 @@ svx_Edit_RID_OFAPAGE_AUTOCORR_REPLACE_ED_SHORT,808896543, svx_Edit_RID_SFXDLG_EDITDICT_ED_REPLACE,1270417446, svx_Edit_RID_SFXDLG_EDITDICT_ED_WORD,1270417444, svx_Edit_RID_SFXDLG_NEWDICT_ED_DICTNAME,1270401035, -svx_Edit_RID_SFXPAGE_GENERAL_ED_APARTMENTNR,733497365, -svx_Edit_RID_SFXPAGE_GENERAL_ED_CITY,733497368, -svx_Edit_RID_SFXPAGE_GENERAL_ED_COMPANY,733497355, -svx_Edit_RID_SFXPAGE_GENERAL_ED_COUNTRY,733497373, -svx_Edit_RID_SFXPAGE_GENERAL_ED_EMAIL,733497382, -svx_Edit_RID_SFXPAGE_GENERAL_ED_FATHERNAME,733497358, -svx_Edit_RID_SFXPAGE_GENERAL_ED_FAX,733497381, -svx_Edit_RID_SFXPAGE_GENERAL_ED_FIRSTNAME,733497359, -svx_Edit_RID_SFXPAGE_GENERAL_ED_NAME,733497360, -svx_Edit_RID_SFXPAGE_GENERAL_ED_PLZ,733497367, -svx_Edit_RID_SFXPAGE_GENERAL_ED_POSITION,733497376, -svx_Edit_RID_SFXPAGE_GENERAL_ED_SHORTNAME,733497361, -svx_Edit_RID_SFXPAGE_GENERAL_ED_STREET,733497364, -svx_Edit_RID_SFXPAGE_GENERAL_ED_TELCOMPANY,733497379, -svx_Edit_RID_SFXPAGE_GENERAL_ED_TELPRIVAT,733497378, -svx_Edit_RID_SFXPAGE_GENERAL_ED_TITLE,733497375, -svx_Edit_RID_SFXPAGE_GENERAL_ED_US_CITY,733497369, -svx_Edit_RID_SFXPAGE_GENERAL_ED_US_STATE,733497370, -svx_Edit_RID_SFXPAGE_GENERAL_ED_US_ZIPCODE,733497371, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_DEFAULT,1368852494, svx_Edit_RID_SVXDLG_ADD_DATAITEM_ED_NAME,1368852492, svx_Edit_RID_SVXDLG_ADD_INSTANCE_ED_INST_NAME,1368950796, diff --git a/source/text/shared/optionen/01010100.xhp b/source/text/shared/optionen/01010100.xhp index 79e3df7..cdedc8b 100644 --- a/source/text/shared/optionen/01010100.xhp +++ b/source/text/shared/optionen/01010100.xhp @@ -36,9 +36,9 @@ bookmark_valueuser data; input/bookmark_value bookmark_valuepersonal data input/bookmark_value /bookmark -bookmark xml-lang=en-US branch=hid/CUI_HID_OPTIONS_GENERAL id=bm_id3152801 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/optuserpage/OptUserPage id=bm_id3152801 localize=false/ paragraph role=heading id=hd_id3155805 xml-lang=en-US level=1 l10n=U oldref=1link href=text/shared/optionen/01010100.xhp name=User DataUser Data/link/paragraph -paragraph role=paragraph id=par_id3156410 xml-lang=en-US l10n=U oldref=2ahelp hid=HID_OPTIONS_GENERALUse this tab page to enter or edit user data./ahelp Some of the data may have already been entered by the user when installing $[officename]./paragraph +paragraph role=paragraph id=par_id3156410 xml-lang=en-US l10n=U oldref=2ahelp hid=cui/ui/optuserpage/OptUserPageUse this tab page to enter or edit user data./ahelp Some of the data may have already been entered by the user when installing $[officename]./paragraph /section section id=howtoget embed href=text/shared/00/0406.xhp#benutzerdaten/ @@ -49,80 +49,86 @@ paragraph role=paragraph id=par_id3149762 xml-lang=en-US l10n=U oldref=4Use the emphAddress/emph field to enter and edit your personal user data./paragraph section id=datenf bookmark xml-lang=en-US branch=hid/sw:Edit:TP_BUSINESS_DATA:ED_COMP id=bm_id3149164 localize=false/commentUFI removed a double ID/comment -bookmark xml-lang=en-US branch=hid/cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY id=bm_id3154306 localize=false/ +bookmark xml-lang=en-US branch=hid/cui/ui/optuserpage/company id=bm_id3154306 localize=false/ paragraph role=heading id=hd_id3156329 xml-lang=en-US level=3 l10n=U oldref=5Company/paragraph -paragraph role=paragraph id=par_id3143270 xml-lang=en-US l10n=U oldref=6ahelp hid=SVX:EDIT:RID_SFXPAGE_GENERAL:ED_COMPANYType the name of your company in this field./ahelp/paragraph +paragraph role=paragraph id=par_id3143270 xml-lang=en-US l10n=U oldref=6ahelp
Re: [Libreoffice-commits] core.git: desktop/source
On Tuesday 19 of February 2013, Julien Nabet wrote:
desktop/source/app/officeipcthread.cxx |8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
New commits:
commit 7d9a7020eb5777f5baaa8beb6af5db9a8796c7c9
Author: Julien Nabet serval2...@yahoo.fr
Date: Tue Feb 19 21:35:19 2013 +0100
Good way to initialize array of char char var[NB]={0}
See http://stackoverflow.com/questions/1920430/c-array-initialization
Change-Id: Ibbbe249684dc34f8aa44868c99cc1344a2928ade
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx index 8db7946..445ccb4 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -497,23 +497,17 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread() else if( pThread-maPipe.create(
aPipeIdent.getStr(), osl_Pipe_OPEN, rSecurity )) // Creation not
successfull, now we try to connect {
osl::StreamPipe aStreamPipe(pThread-maPipe.getHandle());
-char pReceiveBuffer[sc_nCSASeqLength + 1];
+char pReceiveBuffer[sc_nCSASeqLength + 1] = {0};
int nResult = 0;
int nBytes = 0;
int nBufSz = sc_nCSASeqLength + 1;
// read byte per byte
-pReceiveBuffer[0] = 0;
while ((nResult=aStreamPipe.recv( pReceiveBuffer+nBytes,
nBufSz-nBytes))0) { nBytes += nResult;
if (pReceiveBuffer[nBytes-1]=='\0') {
break;
}
}
-/* make sure the buffer is \0 terminated */
-if (nBytes 0)
-{
-pReceiveBuffer[nBytes-1] = 0;
-}
Did you really mean to remove this part?
--
Lubos Lunak
l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: configure.ac
configure.ac | 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 4999a4b5376a4af26e106b303a9b334f1170ff9d
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 20 14:30:38 2013 +0100
configure: LCMS2 needs same treatment as WPD etc.
Change-Id: I2b8f0dd4579c97471653de9f0aa777aa7f5306a8
diff --git a/configure.ac b/configure.ac
index 97365f9..37b18cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7297,13 +7297,11 @@ if test $with_system_lcms2 = yes; then
libo_MINGW_CHECK_DLL([LCMS2], [liblcms2])
else
SYSTEM_LCMS2=NO
-LCMS2_LIBS=-L${OUTDIR}/lib -llcms2
-LCMS2_CFLAGS=-I${WORKDIR}/UnpackedTarball/lcms2/include
-if test $GCC = yes; then
-LCMS2_CFLAGS=${LCMS2_CFLAGS} -Wno-long-long
-fi
fi
-libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2])
+libo_CHECK_SYSTEM_MODULE([lcms2],[LCMS2],[lcms2],[-I${WORKDIR}/UnpackedTarball/lcms2/include],[-L${OUTDIR}/lib
-llcms2])
+if test $GCC = yes; then
+LCMS2_CFLAGS=${LCMS2_CFLAGS} -Wno-long-long
+fi
AC_SUBST([MINGW_LCMS2_DLL])
dnl ===
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/source cui/uiconfig
cui/source/options/optgenrl.cxx |5 +
cui/uiconfig/ui/optuserpage.ui | 123 ++--
2 files changed, 88 insertions(+), 40 deletions(-)
New commits:
commit 631ff4582706ef0535222a10c211e56f5a546fc8
Author: Caolán McNamara caol...@redhat.com
Date: Wed Feb 20 13:47:07 2013 +
remove ugly padding on empty rows
Change-Id: Ie29bb736343e854865aa0eda4dae031931d30d0d
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 812278b..3da87b0 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -200,6 +200,11 @@ public:
: iField(iField_)
, pEdit(pEdit_)
{
+//We want all widgets inside a container, so each row of the toplevel
+//grid has another container in it. To avoid adding spacing to these
+//empty grids they all default to invisible, so show them if their
+//children are visibles
+pEdit-GetParent()-Show();
pEdit-Show();
}
};
diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 3cfbc40..b53421d 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -26,7 +26,6 @@
property name=xalign0/property
property name=label translatable=yes_Company/property
property name=use_underlineTrue/property
-property name=mnemonic_widgetcompany/property
/object
packing
property name=left_attach0/property
@@ -58,7 +57,6 @@
property name=xalign0/property
property name=label translatable=yes_Street/property
property name=use_underlineTrue/property
-property name=mnemonic_widgetstreet/property
/object
packing
property name=left_attach0/property
@@ -152,22 +150,9 @@
/packing
/child
child
- object class=GtkEntry id=company
-property name=can_focusTrue/property
-property name=no_show_allTrue/property
-property name=invisible_charâ¢/property
- /object
- packing
-property name=left_attach1/property
-property name=top_attach0/property
-property name=width1/property
-property name=height1/property
- /packing
-/child
-child
object class=GtkGrid id=grid2
-property name=visibleTrue/property
property name=can_focusFalse/property
+property name=no_show_allTrue/property
property name=column_spacing12/property
child
object class=GtkEntry id=firstname
@@ -236,8 +221,8 @@
/child
child
object class=GtkGrid id=grid3
-property name=visibleTrue/property
property name=can_focusFalse/property
+property name=no_show_allTrue/property
property name=column_spacing12/property
child
object class=GtkEntry id=city
@@ -306,8 +291,8 @@
/child
child
object class=GtkGrid id=grid5
-property name=visibleTrue/property
property name=can_focusFalse/property
+property name=no_show_allTrue/property
property name=hexpandTrue/property
property name=column_spacing12/property
child
@@ -358,8 +343,8 @@
/child
child
object class=GtkGrid id=grid6
-property name=visibleTrue/property
property name=can_focusFalse/property
+property name=no_show_allTrue/property
property name=column_spacing12/property
child
object class=GtkEntry id=home
@@ -409,8 +394,8 @@
/child
child
object class=GtkGrid id=grid7
-property name=visibleTrue/property
property name=can_focusFalse/property
+property name=no_show_allTrue/property
property name=hexpandTrue/property
property name=column_spacing12/property
child
@@ -460,19 +445,6 @@
/packing
/child
child
- object class=GtkEntry id=street
-property name=can_focusTrue/property
-property name=no_show_allTrue/property
-property name=invisible_charâ¢/property
- /object
- packing
-property name=left_attach1/property
-property name=top_attach4/property
-property name=width1/property
-property
Re: [Libreoffice-commits] core.git: desktop/source
Lubos Lunak wrote
On Tuesday 19 of February 2013, Julien Nabet wrote:
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx index 8db7946..445ccb4 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -497,23 +497,17 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread() else if( pThread-maPipe.create(
aPipeIdent.getStr(), osl_Pipe_OPEN, rSecurity )) // Creation not
successfull, now we try to connect {
osl::StreamPipe aStreamPipe(pThread-maPipe.getHandle());
-char pReceiveBuffer[sc_nCSASeqLength + 1];
+char pReceiveBuffer[sc_nCSASeqLength + 1] = {0};
int nResult = 0;
int nBytes = 0;
int nBufSz = sc_nCSASeqLength + 1;
// read byte per byte
-pReceiveBuffer[0] = 0;
while ((nResult=aStreamPipe.recv( pReceiveBuffer+nBytes,
nBufSz-nBytes))0) { nBytes += nResult;
if (pReceiveBuffer[nBytes-1]=='\0') {
break;
}
}
-/* make sure the buffer is \0 terminated */
-if (nBytes 0)
-{
-pReceiveBuffer[nBytes-1] = 0;
-}
Did you really mean to remove this part?
Hi Lubos,
Yes I meant it, why? Is it wrong?
if pReceiveBuffer is initialized with 0 for the (sc_nCSASeqLength + 1)
elements thanks to = {0} initialization, what obvious thing did I miss? Why
pReceiveBuffer[nBytes-1] = 0; would need to stay?
Of course, if my commit is wrong, I'll revert it after my day time job
Julien
--
View this message in context:
http://nabble.documentfoundation.org/Re-Libreoffice-commits-core-git-desktop-source-tp4038892p4038893.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sw/source
sw/source/ui/docvw/edtwin.cxx | 43 +++---
sw/source/ui/wrtsh/wrtsh2.cxx | 11 --
2 files changed, 29 insertions(+), 25 deletions(-)
New commits:
commit 7063ea7cc1eadb22ac3ca6c2d54001408b60ef95
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 20 00:08:45 2013 +0100
fdo#59928: sw: fix mouse selection of fields differently
Unfortunately selecting the field in SwEditWin::MouseButtonDown()
prevents the click field handling code in SwEditWin::MouseButtonUp()
from running. Instead select the field in MouseButtonUp and
SwWrtShell::ClickToField(), which seems to work better.
(regression from 94721b2aec614e0d99504138d484b2ad6cd550c7)
Conflicts:
sw/source/ui/wrtsh/wrtsh2.cxx
Change-Id: I3d769487b9d5225ffd07b384fbb0ce01e0733be5
(cherry picked from commit a4a457100a3a6e9f59113e82c9d0b12786273671)
Reviewed-on: https://gerrit.libreoffice.org/2286
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 289aa15..27853a8 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -3557,36 +3557,17 @@ void SwEditWin::MouseButtonDown(const MouseEvent
_rMEvt)
// Are we clicking on a field?
if (rSh.GetContentAtPos(aDocPos, aFieldAtPos))
{
-bool bAddMode(false); // AdditionalMode if applicable
-if (KEY_MOD1 == rMEvt.GetModifier() !rSh.IsAddMode())
-{
-bAddMode = true;
-rSh.EnterAddMode();
-}
rSh.SetCursor(aDocPos, bOnlyText);
-// Select the field. Unfortunately cursor may be on field
+// Unfortunately the cursor may be on field
// position or on position after field depending on which
// half of the field was clicked on.
SwTxtAttr const*const pTxtFld(aFieldAtPos.pFndTxtAttr);
if (rSh.GetCurrentShellCursor().GetPoint()-nContent
-.GetIndex() == *pTxtFld-GetStart())
-{
-rSh.Right( CRSR_SKIP_CHARS, true, 1, false );
-rSh.NormalizePam();
-}
-else
+.GetIndex() != *pTxtFld-GetStart())
{
assert(rSh.GetCurrentShellCursor().GetPoint()-nContent
.GetIndex() == (*pTxtFld-GetStart() + 1));
-rSh.Left( CRSR_SKIP_CHARS, true, 1, false );
-}
-// it's a bit of a mystery what this is good for?
-// in this case we assume it's valid since we just
-// selected a field
-bValidCrsrPos = true;
-if (bAddMode)
-{
-rSh.LeaveAddMode();
+rSh.Left( CRSR_SKIP_CHARS, false, 1, false );
}
// don't go into the !bOverSelect block below - it moves
// the cursor
@@ -4421,7 +4402,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
if(pApplyTempl)
bExecHyperlinks = sal_False;
-SwContentAtPos aCntntAtPos(
SwContentAtPos::SW_CLICKFIELD |
+SwContentAtPos aCntntAtPos( SwContentAtPos::SW_FIELD |
SwContentAtPos::SW_INETATTR |
SwContentAtPos::SW_SMARTTAG | SwContentAtPos::SW_FORMCTRL);
@@ -4440,7 +4421,23 @@ void SwEditWin::MouseButtonUp(const MouseEvent rMEvt)
if( SwContentAtPos::SW_FIELD ==
aCntntAtPos.eCntntAtPos )
{
+bool bAddMode(false);
+// AdditionalMode if applicable
+if (KEY_MOD1 == rMEvt.GetModifier()
+ !rSh.IsAddMode())
+{
+bAddMode = true;
+rSh.EnterAddMode();
+}
rSh.ClickToField( *aCntntAtPos.aFnd.pFld );
+// a bit of a mystery what this is good for?
+// in this case we assume it's valid since we
+// just selected a field
+bValidCrsrPos = true;
+if (bAddMode)
+{
+
Re: [Libreoffice-commits] core.git: desktop/source
Hi all,
I may be completely wrong and I really don't know this code and what it is
aimet to, but I'm worried that
if (nBytes 0)
{
pReceiveBuffer[nBytes-1] = 0;
}
overwrites a received character (that could be '\0' or not).
If I understand correctly, the target is to have the sequence of characters
being '\0' terminated whether that '\0' whas in the stream or not, and then I
would say that the whole routine should be something like:
char pReceiveBuffer[sc_nCSASeqLength + 1] = {0};
int nResult = 0;
int nBytes = 0;
// read byte per byte
while ((nResult=aStreamPipe.recv( pReceiveBuffer+nBytes,
sc_nCSASeqLength-nBytes))0)
{
nBytes += nResult;
if (pReceiveBuffer[nBytes-1]=='\0')
{
break;
}
}
// unconditionally end stream with '\0'
pReceiveBuffer[nBytes] = '\0';
In case a '\0' is already in the sequence and the additional '\0' is undesired,
nBytes can be adjusted in the if (pReceiveBuffer[nBytes-1]=='\0') so to
overwrite the existing one.
Also, the read byte per byte comment looks wrong to me.
If I misunderstood the point then apologies for the noise.
Cheers
Matteo
On Wed, 20 Feb 2013 05:54:50 -0800 (PST)
julien2412 serval2...@yahoo.fr wrote:
Lubos Lunak wrote
On Tuesday 19 of February 2013, Julien Nabet wrote:
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx index 8db7946..445ccb4 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -497,23 +497,17 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread() else if( pThread-maPipe.create(
aPipeIdent.getStr(), osl_Pipe_OPEN, rSecurity )) // Creation not
successfull, now we try to connect {
osl::StreamPipe aStreamPipe(pThread-maPipe.getHandle());
-char pReceiveBuffer[sc_nCSASeqLength + 1];
+char pReceiveBuffer[sc_nCSASeqLength + 1] = {0};
int nResult = 0;
int nBytes = 0;
int nBufSz = sc_nCSASeqLength + 1;
// read byte per byte
-pReceiveBuffer[0] = 0;
while ((nResult=aStreamPipe.recv( pReceiveBuffer+nBytes,
nBufSz-nBytes))0) { nBytes += nResult;
if (pReceiveBuffer[nBytes-1]=='\0') {
break;
}
}
-/* make sure the buffer is \0 terminated */
-if (nBytes 0)
-{
-pReceiveBuffer[nBytes-1] = 0;
-}
Did you really mean to remove this part?
Hi Lubos,
Yes I meant it, why? Is it wrong?
if pReceiveBuffer is initialized with 0 for the (sc_nCSASeqLength + 1)
elements thanks to = {0} initialization, what obvious thing did I miss? Why
pReceiveBuffer[nBytes-1] = 0; would need to stay?
Of course, if my commit is wrong, I'll revert it after my day time job
Julien
--
View this message in context:
http://nabble.documentfoundation.org/Re-Libreoffice-commits-core-git-desktop-source-tp4038892p4038893.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] core.git: desktop/source
On Wed, 20 Feb 2013 15:32:10 +0100
Matteo Casalin matteo.casa...@gmx.com wrote:
Hi all,
I may be completely wrong and I really don't know this code and what it
is aimet to, but I'm worried that
if (nBytes 0)
{
pReceiveBuffer[nBytes-1] = 0;
}
overwrites a received character (that could be '\0' or not).
If I understand correctly, the target is to have the sequence of characters
being '\0' terminated whether that '\0' whas in the stream or not, and then I
would say that the whole routine should be something like:
char pReceiveBuffer[sc_nCSASeqLength + 1] = {0};
As an additional thought, this could then be :
char pReceiveBuffer[sc_nCSASeqLength + 1];
int nResult = 0;
int nBytes = 0;
// read byte per byte
while ((nResult=aStreamPipe.recv( pReceiveBuffer+nBytes,
sc_nCSASeqLength-nBytes))0)
{
nBytes += nResult;
if (pReceiveBuffer[nBytes-1]=='\0')
{
break;
}
}
// unconditionally end stream with '\0'
pReceiveBuffer[nBytes] = '\0';
In case a '\0' is already in the sequence and the additional '\0' is
undesired, nBytes can be adjusted in the if
(pReceiveBuffer[nBytes-1]=='\0') so to overwrite the existing one.
Also, the read byte per byte comment looks wrong to me.
If I misunderstood the point then apologies for the noise.
Cheers
Matteo
On Wed, 20 Feb 2013 05:54:50 -0800 (PST)
julien2412 serval2...@yahoo.fr wrote:
Lubos Lunak wrote
On Tuesday 19 of February 2013, Julien Nabet wrote:
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx index 8db7946..445ccb4 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -497,23 +497,17 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread() else if( pThread-maPipe.create(
aPipeIdent.getStr(), osl_Pipe_OPEN, rSecurity )) // Creation not
successfull, now we try to connect {
osl::StreamPipe aStreamPipe(pThread-maPipe.getHandle());
-char pReceiveBuffer[sc_nCSASeqLength + 1];
+char pReceiveBuffer[sc_nCSASeqLength + 1] = {0};
int nResult = 0;
int nBytes = 0;
int nBufSz = sc_nCSASeqLength + 1;
// read byte per byte
-pReceiveBuffer[0] = 0;
while ((nResult=aStreamPipe.recv( pReceiveBuffer+nBytes,
nBufSz-nBytes))0) { nBytes += nResult;
if (pReceiveBuffer[nBytes-1]=='\0') {
break;
}
}
-/* make sure the buffer is \0 terminated */
-if (nBytes 0)
-{
-pReceiveBuffer[nBytes-1] = 0;
-}
Did you really mean to remove this part?
Hi Lubos,
Yes I meant it, why? Is it wrong?
if pReceiveBuffer is initialized with 0 for the (sc_nCSASeqLength + 1)
elements thanks to = {0} initialization, what obvious thing did I miss? Why
pReceiveBuffer[nBytes-1] = 0; would need to stay?
Of course, if my commit is wrong, I'll revert it after my day time job
Julien
--
View this message in context:
http://nabble.documentfoundation.org/Re-Libreoffice-commits-core-git-desktop-source-tp4038892p4038893.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] core.git: desktop/source
On Wednesday 20 of February 2013, julien2412 [via Document Foundation Mail
Archive] wrote:
Lubos Lunak wrote
On Tuesday 19 of February 2013, Julien Nabet wrote:
diff --git a/desktop/source/app/officeipcthread.cxx
b/desktop/source/app/officeipcthread.cxx index 8db7946..445ccb4 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -497,23 +497,17 @@ OfficeIPCThread::Status
OfficeIPCThread::EnableOfficeIPCThread() else if(
pThread-maPipe.create( aPipeIdent.getStr(), osl_Pipe_OPEN, rSecurity ))
// Creation not successfull, now we try to connect {
osl::StreamPipe aStreamPipe(pThread-maPipe.getHandle());
-char pReceiveBuffer[sc_nCSASeqLength + 1];
+char pReceiveBuffer[sc_nCSASeqLength + 1] = {0};
int nResult = 0;
int nBytes = 0;
int nBufSz = sc_nCSASeqLength + 1;
// read byte per byte
-pReceiveBuffer[0] = 0;
while ((nResult=aStreamPipe.recv( pReceiveBuffer+nBytes,
nBufSz-nBytes))0) { nBytes += nResult;
if (pReceiveBuffer[nBytes-1]=='\0') {
break;
}
}
-/* make sure the buffer is \0 terminated */
-if (nBytes 0)
-{
-pReceiveBuffer[nBytes-1] = 0;
-}
Did you really mean to remove this part?
Hi Lubos,
Yes I meant it, why? Is it wrong?
if pReceiveBuffer is initialized with 0 for the (sc_nCSASeqLength + 1)
elements thanks to = {0} initialization, what obvious thing did I miss?
Sorry, I did not realize that = { 0 } actually clears the rest of the array.
And I do not quite understand why clearing an entire array is supposed to be
a good way to initialize it when just setting the last one to 0 is enough.
Why pReceiveBuffer[nBytes-1] = 0; would need to stay?
If I'm reading the code correctly, nBytes-1 is not the position after the
read data, but the last read item. Which should mean that the repeated recv()
may rewrite all the 0's from the initialization. That rather begs the
question why it changes the last read item instead of terminating it, so the
code may have been already broken to begin with.
--
Lubos Lunak
l.lu...@suse.cz
--
View this message in context:
http://nabble.documentfoundation.org/Re-Libreoffice-commits-core-git-desktop-source-tp4038892p4038899.html
Sent from the Dev mailing list archive at Nabble.com.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source
desktop/source/app/app.cxx | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 2d907dcca7edde8cd02446cf7322556095ba447f
Author: Tor Lillqvist t...@iki.fi
Date: Wed Feb 20 15:26:00 2013 +0200
s/FaultBack/Fallback/
Change-Id: I9ecf4f57770151c1e4976c57d1f93982f35ac0fb
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index bc75d8d..1dc7552 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -357,27 +357,27 @@ namespace {
// is not available.
OUString GetMsgString(
-sal_uInt16 nId, const OUString aFaultBackMsg,
-bool bAlwaysUseFaultBackMsg = false )
+sal_uInt16 nId, const OUString aFallbackMsg,
+bool bAlwaysUseFallbackMsg = false )
{
-if ( !bAlwaysUseFaultBackMsg )
+if ( !bAlwaysUseFallbackMsg )
{
ResMgr* resMgr = Desktop::GetDesktopResManager();
if ( resMgr )
return OUString( String( ResId( nId, *resMgr )));
}
-return aFaultBackMsg;
+return aFallbackMsg;
}
OUString MakeStartupErrorMessage(
-OUString const aErrorMessage, bool bAlwaysUseFaultBackMsg = false )
+OUString const aErrorMessage, bool bAlwaysUseFallbackMsg = false )
{
OUStringBufferaDiagnosticMessage( 100 );
aDiagnosticMessage.append(
GetMsgString(
STR_BOOTSTRAP_ERR_CANNOT_START, The program cannot be started.,
-bAlwaysUseFaultBackMsg ) );
+bAlwaysUseFallbackMsg ) );
aDiagnosticMessage.appendAscii( \n );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - sw/source writerfilter/source
sw/source/core/unocore/unotext.cxx |9 +
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 46 -
writerfilter/source/dmapper/DomainMapperTableManager.cxx |9 -
writerfilter/source/dmapper/DomainMapperTableManager.hxx |4
writerfilter/source/dmapper/TablePositionHandler.cxx | 117 ++-
writerfilter/source/dmapper/TablePositionHandler.hxx | 14 +
writerfilter/source/ooxml/model.xml |9 -
7 files changed, 151 insertions(+), 57 deletions(-)
New commits:
commit fca2522c576a386535067ed422a90a05ca648f63
Author: Cédric Bosdonnat cedric.bosdon...@free.fr
Date: Wed Feb 20 11:04:16 2013 +0100
n#779642: Fixed floating tables import in writerfilter
(cherry picked from commit d0cde9640b52ccfbb28ed1f65bba0927afd7b69b)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapperTableManager.hxx
writerfilter/source/dmapper/TablePositionHandler.cxx
writerfilter/source/dmapper/TablePositionHandler.hxx
Change-Id: I706d36358db98524bdf5d1caf0f0543b9170b0bc
diff --git a/sw/source/core/unocore/unotext.cxx
b/sw/source/core/unocore/unotext.cxx
index ea5e83b..4f519c2 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1603,7 +1603,14 @@ throw (lang::IllegalArgumentException,
uno::RuntimeException)
// remove the addtional paragraphs in the end
if (pStartStartNode-GetStartNodeType() == SwTableBoxStartNode)
{
-SwTableNode *const
pStartTableNode(pStartStartNode-FindTableNode());
+SwTableNode * pStartTableNode(pStartStartNode-FindTableNode());
+// Is it the same table start node than the end?
+SwTableNode *const
pEndStartTableNode(pEndStartNode-FindTableNode());
+while (pEndStartTableNode-GetIndex()
pStartTableNode-GetIndex())
+{
+SwStartNode* pStartStartTableNode =
pStartTableNode-StartOfSectionNode();
+pStartTableNode = pStartStartTableNode-FindTableNode();
+}
const SwNodeIndex aTblIdx( *pStartTableNode, -1 );
SwPosition aBefore(aTblIdx);
bParaBeforeInserted = GetDoc()-AppendTxtNode( aBefore );
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index f44e93c..65a26f9 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -720,7 +720,8 @@ void DomainMapperTableHandler::endTable(unsigned int
nestedTableLevel)
uno::Referencetext::XTextRange xStart;
uno::Referencetext::XTextRange xEnd;
// If we want to make this table a floating one.
-bool bFloating =
!m_rDMapper_Impl.getTableManager().getTableVertAnchor().isEmpty();
+uno::Sequencebeans::PropertyValue aFrameProperties =
m_rDMapper_Impl.getTableManager().getTablePosition();
+bool bFloating = aFrameProperties.hasElements();
// Additional checks: if we can do this.
if (bFloating (*m_pTableSeq)[0].getLength() 0
(*m_pTableSeq)[0][0].getLength() 0)
{
@@ -767,46 +768,11 @@ void DomainMapperTableHandler::endTable(unsigned int
nestedTableLevel)
if (xTable.is() xStart.is() xEnd.is())
{
uno::Referencebeans::XPropertySet xTableProperties(xTable,
uno::UNO_QUERY);
-uno::Sequence beans::PropertyValue aFrameProperties(16);
-beans::PropertyValue* pFrameProperties =
aFrameProperties.getArray();
-pFrameProperties[0].Name = Width;
-pFrameProperties[0].Value =
xTableProperties-getPropertyValue(Width);
-
-pFrameProperties[1].Name = LeftBorderDistance;
-pFrameProperties[1].Value = sal_Int32(0);
-pFrameProperties[2].Name = RightBorderDistance;
-pFrameProperties[2].Value = sal_Int32(0);
-pFrameProperties[3].Name = TopBorderDistance;
-pFrameProperties[3].Value = sal_Int32(0);
-pFrameProperties[4].Name = BottomBorderDistance;
-pFrameProperties[4].Value = sal_Int32(0);
-
-pFrameProperties[5].Name = LeftMargin;
-pFrameProperties[5].Value = sal_Int32(0);
-pFrameProperties[6].Name = RightMargin;
-pFrameProperties[6].Value = sal_Int32(0);
-pFrameProperties[7].Name = TopMargin;
-pFrameProperties[7].Value = sal_Int32(0);
-pFrameProperties[8].Name = BottomMargin;
-pFrameProperties[8].Value = sal_Int32(0);
-
-table::BorderLine2 aEmptyBorder;
-pFrameProperties[9].Name = TopBorder;
-pFrameProperties[9].Value = aEmptyBorder;
-pFrameProperties[10].Name = BottomBorder;
-
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Bug 54157 depends on bug 59928, which changed state. Bug 59928 Summary: EDITING: Impossible to fill text into Fields - Functions - Placeholder - text https://bugs.freedesktop.org/show_bug.cgi?id=59928 What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: setup_native/source solenv/bin
setup_native/source/packinfo/packinfo_ure.txt |6 ++-
solenv/bin/modules/installer/epmfile.pm | 43 ++
2 files changed, 34 insertions(+), 15 deletions(-)
New commits:
commit 2b3d675f0bb4a1b37ad502a67b1719b2fc3fc364
Author: Petr Mladek pmla...@suse.cz
Date: Tue Feb 19 16:04:37 2013 +0100
fix dependencies of the obsolete stdlibs package on linux
The old version should get repalced by the ure package. It should also
conflict
with the new ure package.
This commit adds support for %incompat epm tag. It produces conflicts in rpm
and deb. It can be defined in setup_native/source/packinfo by
linuxincompat.
This commit also removes obsolete hack for debian dependencies.
libreoffice-bundled conflict is mentioned in the desktop-integration package
these day. The hack in epmfile.pm was not used because no package
used replace tag.
Change-Id: I5e9cb89a6108c22c61287fce1ffc6baf3f618d15
Reviewed-on: https://gerrit.libreoffice.org/2260
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
diff --git a/setup_native/source/packinfo/packinfo_ure.txt
b/setup_native/source/packinfo/packinfo_ure.txt
index dfa0375..36ebc0d 100644
--- a/setup_native/source/packinfo/packinfo_ure.txt
+++ b/setup_native/source/packinfo/packinfo_ure.txt
@@ -21,7 +21,8 @@ module = gid_Module_Root
solarispackagename = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure
solarisrequires = SUNWzlibr
solarisprovides = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
-provides = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
+linuxreplaces = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
+linuxincompat = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
packagename = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure
copyright = 2012 The Document Foundation
solariscopyright = solariscopyrightfile
@@ -36,7 +37,8 @@ module = gid_Module_Root_Ure_Hidden
solarispackagename = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure
solarisrequires = SUNWzlibr
solarisprovides = %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
-provides = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
+linuxreplaces = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
+linuxincompat = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs
packagename = %UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure
copyright = 2012 The Document Foundation
solariscopyright = solariscopyrightfile
diff --git a/solenv/bin/modules/installer/epmfile.pm
b/solenv/bin/modules/installer/epmfile.pm
index 72420d4..7ee6d13 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -265,6 +265,8 @@ sub create_epm_header
# %readme /test/replace/01/README01
# %requires foo
# %provides bar
+# %replaces bar
+# %incompat bar
# The first language in the languages array determines the language of
license and readme file
@@ -512,23 +514,38 @@ sub create_epm_header
$onereplaces = debian_rewrite($onereplaces);
$line = %replaces . . $onereplaces . \n;
push(@epmheader, $line);
+}
+}
+}
-# Force the openofficeorg packages to get removed,
-# see
http://www.debian.org/doc/debian-policy/ch-relationships.html
-# 7.5.2 Replacing whole packages, forcing their removal
+# including %incompat
-if ( $installer::globals::debian )
-{
-$line = %incompat . . $onereplaces . \n;
-push(@epmheader, $line);
-}
-}
+my $incompat = ;
+
+if (( $installer::globals::issolarispkgbuild ) ( !
$installer::globals::patch ))
+{
+$incompat = solarisincompat; # the name in the packagelist
+}
+elsif (( $installer::globals::islinuxbuild ) ( !
$installer::globals::patch ))
+{
+$incompat = linuxincompat;# the name in the packagelist
+}
+
+if (( $incompat ) ( ! $installer::globals::patch ))
+{
+if ( $onepackage-{$incompat} )
+{
+my $incompatstring = $onepackage-{$incompat};
-if ( $installer::globals::debian
$variableshashref-{'UNIXPRODUCTNAME'} eq 'libreoffice' )
+my $allincompat =
installer::converter::convert_stringlist_into_array(\$incompatstring, ,);
+
+for ( my $i = 0; $i = $#{$allincompat}; $i++ )
{
-$line = %provides . libreoffice-unbundled\n;
-push(@epmheader, $line);
-$line = %incompat . libreoffice-bundled\n;
+my $oneincompat = ${$allincompat}[$i];
+$oneincompat =~ s/\s*$//;
+
installer::packagelist::resolve_packagevariables(\$oneincompat,
$variableshashref, 1);
+$oneincompat = debian_rewrite($oneincompat);
+$line = %incompat . .
[Libreoffice-commits] core.git: cui/Library_cui.mk cui/source
cui/Library_cui.mk |1
cui/source/dialogs/about.cxx | 123 +++
2 files changed, 103 insertions(+), 21 deletions(-)
New commits:
commit 6af2468cf0a6c231747c24fd057a8cb90cbbe11d
Author: Thorsten Behrens tbehr...@suse.com
Date: Thu Jan 31 23:59:10 2013 +0100
Fix fdo#59970 slowless of about box rendering
Prevent creation of transparent bitmap at arbitrary scale, and
subsequent scaling down. For remote X, that even has to fetch
pixel back from remote side for manual scaling.
Change-Id: I58e011231f2b81b913a6b02dd973385ef5664379
Signed-off-by: Petr Mladek pmla...@suse.cz
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 6e830b7..1966b7f 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -50,6 +50,7 @@ $(eval $(call gb_Library_use_libraries,cui,\
comphelper \
cppu \
cppuhelper \
+drawinglayer \
editeng \
i18nisolang1 \
jvmfwk \
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 2c9df74..f7332b9 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -20,6 +20,7 @@
#include vcl/svapp.hxx
#include vcl/msgbox.hxx
+#include osl/process.h
#include tools/stream.hxx
#include rtl/bootstrap.hxx
#include unotools/configmgr.hxx
@@ -35,6 +36,13 @@
#include comphelper/anytostring.hxx
#include cppuhelper/exc_hlp.hxx
#include cppuhelper/bootstrap.hxx
+#include com/sun/star/graphic/XPrimitive2DRenderer.hpp
+#include basegfx/numeric/ftools.hxx
+#include vcl/canvastools.hxx
+#include com/sun/star/geometry/RealRectangle2D.hpp
+#include com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp
+#include basegfx/matrix/b2dhommatrixtools.hxx
+#include drawinglayer/primitive2d/transformprimitive2d.hxx
#include sfx2/sfxuno.hxx
#include sfx2/sfxcommands.h
@@ -183,6 +191,91 @@ void AboutDialog::StyleControls()
aCancelButton.GrabFocus();
}
+static bool loadBrandSvg(const char *pName, BitmapEx rBitmap, int nWidth )
+{
+// Load from disk
+// -
+rtl::OUString aBaseName = ( rtl::OUString(/) +
+rtl::OUString::createFromAscii( pName ) );
+rtl::OUString aSvg( .svg );
+
+rtl_Locale *pLoc = NULL;
+osl_getProcessLocale (pLoc);
+LanguageTag aLanguageTag( *pLoc);
+
+rtl::OUString aName = aBaseName + aSvg;
+rtl::OUString aLocaleName = ( aBaseName + rtl::OUString(-) +
+ aLanguageTag.getBcp47() +
+ aSvg );
+rtl::OUString uri = rtl::OUString::createFromAscii(
$BRAND_BASE_DIR/program ) + aBaseName+aSvg;
+rtl::Bootstrap::expandMacros( uri );
+INetURLObject aObj( uri );
+SvgData aSvgData(aObj.PathToFileName());
+
+// transform into [0,0,width,width*aspect] std dimensions
+// -
+basegfx::B2DRange aRange(aSvgData.getRange());
+const double fAspectRatio(aRange.getWidth()/aRange.getHeight());
+basegfx::B2DHomMatrix aTransform(
+basegfx::tools::createTranslateB2DHomMatrix(
+-aRange.getMinX(),
+-aRange.getMinY()));
+aTransform.scale(
+nWidth / aRange.getWidth(),
+nWidth / fAspectRatio / aRange.getHeight());
+const drawinglayer::primitive2d::Primitive2DReference xTransformRef(
+new drawinglayer::primitive2d::TransformPrimitive2D(
+aTransform,
+aSvgData.getPrimitive2DSequence()));
+
+// UNO dance to render from drawinglayer
+// -
+uno::Reference lang::XMultiServiceFactory
xFactory(::comphelper::getProcessServiceFactory());
+const rtl::OUString aServiceName(com.sun.star.graphic.Primitive2DTools);
+
+try
+{
+const uno::Reference graphic::XPrimitive2DRenderer
xPrimitive2DRenderer(
+xFactory-createInstance(aServiceName),
+uno::UNO_QUERY_THROW);
+
+if(xPrimitive2DRenderer.is())
+{
+// cancel out rasterize's mm2pixel conversion
+const double fFakeDPI=1000.0/2.54;
+
+geometry::RealRectangle2D aRealRect(
+0, 0,
+nWidth, nWidth / fAspectRatio);
+
+const uno::Reference rendering::XBitmap xBitmap(
+xPrimitive2DRenderer-rasterize(
+
drawinglayer::primitive2d::Primitive2DSequence(xTransformRef, 1),
+uno::Sequence beans::PropertyValue (),
+fFakeDPI,
+fFakeDPI,
+aRealRect,
+50));
+
+if(xBitmap.is())
+{
+const uno::Reference rendering::XIntegerReadOnlyBitmap
xIntBmp(xBitmap, uno::UNO_QUERY_THROW);
+
+if(xIntBmp.is())
+{
+rBitmap =
Looking for PyUno Contributor(s)
Hi All! I am one of the members of the Quality Assurance team with LibreOffice and we are looking for a volunteer to work with myself designing (and coding) the framework to start automating our stats. It's been on my list for much too long and I just don't have the technical know how to do it. If there are are users or developers who can slowly get this accomplished it would greatly help QA as well as Marketing as our stats are done almost completely manually at this point, not only is this time consuming but it's also likely that there could be mistakes or missing data. If there are any takers, again this would be a great help, I have a general idea of what I'd like to do, just trying to find people who are capable of implementation. Many thanks and best regards, Joel ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-commits] core.git: desktop/source
Lubos Lunak wrote
Lubos Lunak wrote
Sorry, I did not realize that = { 0 } actually clears the rest of the
array.
And I do not quite understand why clearing an entire array is supposed to
be
a good way to initialize it when just setting the last one to 0 is enough.
...
Why pReceiveBuffer[nBytes-1] = 0; would need to stay?
If I'm reading the code correctly, nBytes-1 is not the position after
the
read data, but the last read item. Which should mean that the repeated
recv()
may rewrite all the 0's from the initialization. That rather begs the
question why it changes the last read item instead of terminating it, so
the
code may have been already broken to begin with.
I thought it could be interesting to put together declaration and
initialization so we're sure we won't have some side effects (I thought it
could be more clean too).
To be honest, I thought too it was a very straightforward patch, so i pushed
it on master instead of having submitted for gerrit review. Obviously, I was
wrong.
For the second part of your message, I really don't know.
Again, don't hesitate to tell me if I must revert this commit.
Julien
--
View this message in context:
http://nabble.documentfoundation.org/Re-Libreoffice-commits-core-git-desktop-source-tp4038892p4038909.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - sc/source xmlhelp/source
sc/source/core/data/table2.cxx |7 ++-
sc/source/ui/condformat/condformatdlgentry.cxx | 46 ++---
xmlhelp/source/cxxhelp/provider/content.cxx|8 ++--
3 files changed, 35 insertions(+), 26 deletions(-)
New commits:
commit 41095e934bcd83e08a472c8fb53743cd3f8e926c
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Feb 19 20:11:28 2013 +0100
respect nDelFlags, fdo#57661
Change-Id: I77d3e1f537b59504125d66f66f691d01f8f23894
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 97bd375..db43e5e 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -567,7 +567,7 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const
ScMarkData rMark )
if (nDelFlag IDF_NOTE pRange)
maNotes.erase(pRange-aStart.Col(), pRange-aStart.Row(),
pRange-aEnd.Col(), pRange-aEnd.Row(), true);
-if(pRange pRange-aStart.Tab() == nTab)
+if((nDelFlag IDF_ATTRIB) pRange pRange-aStart.Tab() == nTab)
mpCondFormatList-DeleteArea( pRange-aStart.Col(),
pRange-aStart.Row(), pRange-aEnd.Col(), pRange-aEnd.Row() );
}
commit de1c23bb7dc952b6b279d0f7505509486c3b5da6
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Tue Feb 19 19:18:35 2013 +0100
respect local number format in cond format dlg, fdo#60574
Change-Id: Iec185ac6c6447176731619249cdda4457f1bb8a3
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx
b/sc/source/ui/condformat/condformatdlgentry.cxx
index e66ab7e..40d247e 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -583,7 +583,7 @@ void ScFormulaFrmtEntry::SetInactive()
namespace {
-void SetColorScaleEntryTypes( const ScColorScaleEntry rEntry, ListBox
rLbType, Edit rEdit, ColorListBox rLbCol )
+void SetColorScaleEntryTypes( const ScColorScaleEntry rEntry, ListBox
rLbType, Edit rEdit, ColorListBox rLbCol, ScDocument* pDoc )
{
// entry Automatic is not available for color scales
sal_Int32 nIndex = static_castsal_Int32(rEntry.GetType());
@@ -597,7 +597,13 @@ void SetColorScaleEntryTypes( const ScColorScaleEntry
rEntry, ListBox rLbType,
case COLORSCALE_PERCENTILE:
case COLORSCALE_VALUE:
case COLORSCALE_PERCENT:
-rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue()));
+{
+double nVal = rEntry.GetValue();
+SvNumberFormatter* pNumberFormatter = pDoc-GetFormatTable();
+rtl::OUString aText;
+pNumberFormatter-GetInputLineString(nVal, 0, aText);
+rEdit.SetText(aText);
+}
break;
case COLORSCALE_FORMULA:
rEdit.SetText(rEntry.GetFormula(formula::FormulaGrammar::GRAM_DEFAULT));
@@ -673,9 +679,9 @@ ScColorScale2FrmtEntry::ScColorScale2FrmtEntry( Window*
pParent, ScDocument* pDo
if(pFormat)
{
ScColorScaleFormat::const_iterator itr = pFormat-begin();
-SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin);
+SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin,
pDoc);
++itr;
-SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax);
+SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax,
pDoc);
}
else
{
@@ -825,12 +831,12 @@ ScColorScale3FrmtEntry::ScColorScale3FrmtEntry( Window*
pParent, ScDocument* pDo
if(pFormat)
{
ScColorScaleFormat::const_iterator itr = pFormat-begin();
-SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin);
+SetColorScaleEntryTypes(*itr, maLbEntryTypeMin, maEdMin, maLbColMin,
pDoc);
assert(pFormat-size() == 3);
++itr;
-SetColorScaleEntryTypes(*itr, maLbEntryTypeMiddle, maEdMiddle,
maLbColMiddle);
+SetColorScaleEntryTypes(*itr, maLbEntryTypeMiddle, maEdMiddle,
maLbColMiddle, pDoc);
++itr;
-SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax);
+SetColorScaleEntryTypes(*itr, maLbEntryTypeMax, maEdMax, maLbColMax,
pDoc);
}
else
{
@@ -1006,7 +1012,7 @@ IMPL_LINK_NOARG( ScConditionFrmtEntry,
ConditionTypeSelectHdl )
namespace {
-void SetDataBarEntryTypes( const ScColorScaleEntry rEntry, ListBox rLbType,
Edit rEdit )
+void SetDataBarEntryTypes( const ScColorScaleEntry rEntry, ListBox rLbType,
Edit rEdit, ScDocument* pDoc )
{
rLbType.SelectEntryPos(rEntry.GetType());
switch(rEntry.GetType())
@@ -1015,18 +1021,20 @@ void SetDataBarEntryTypes( const ScColorScaleEntry
rEntry, ListBox rLbType, Ed
case COLORSCALE_MIN:
case COLORSCALE_MAX:
break;
-case COLORSCALE_PERCENTILE:
-rEdit.SetText(rtl::OUString::valueOf(rEntry.GetValue()));
-break;
+case COLORSCALE_VALUE:
case
[Libreoffice-commits] core.git: configure.ac scp2/InstallModule_python.mk scp2/source
configure.ac | 10 -- scp2/InstallModule_python.mk |3 - scp2/source/extensions/file_extensions.scp | 20 scp2/source/extensions/module_extensions.scp | 18 --- scp2/source/extensions/module_extensions.ulf |6 --- scp2/source/ooo/file_ooo.scp |6 +++ scp2/source/python/file_python.scp | 14 scp2/source/python/module_python.scp | 13 +++- scp2/source/python/module_python.ulf | 32 scp2/source/python/module_python_librelogo.scp |4 +- scp2/source/python/module_python_mailmerge.scp | 39 - scp2/source/python/module_python_mailmerge.ulf | 23 -- scp2/source/python/profileitem_python.scp |6 +-- 13 files changed, 31 insertions(+), 163 deletions(-) New commits: commit 83b4703137fdf49304e41202cc91a5574b2e53e7 Author: Andras Timar ati...@suse.com Date: Tue Feb 19 15:21:23 2013 +0100 fdo#49202 install the Python-UNO Bridge component on Windows unconditionally Change-Id: I1d9d62b024c4442182d67d93915af0f793265ebd diff --git a/configure.ac b/configure.ac index 37b18cc..25145ca 100644 --- a/configure.ac +++ b/configure.ac @@ -10254,16 +10254,6 @@ AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT) AC_SUBST(SYSTEM_RHINO) AC_SUBST(RHINO_JAR) -dnl Scripting provider for Python extension? -dnl We always provide this unless we have disabled Python completely -if test $enable_python = no; then -ENABLE_SCRIPTING_PYTHON=NO -SCPDEFS=$SCPDEFS -DWITHOUT_SCRIPTING_PYTHON -else -ENABLE_SCRIPTING_PYTHON=YES -fi -AC_SUBST(ENABLE_SCRIPTING_PYTHON) - supports_multilib= case $host_cpu in x86_64 | powerpc64 | s390x) diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index 7153dee..8b8af48 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -57,12 +57,11 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\ scp2/source/python/file_python \ scp2/source/python/file_python_librelogo \ scp2/source/python/profileitem_python \ +scp2/source/python/module_python \ )) $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/python,\ -scp2/source/python/module_python \ scp2/source/python/module_python_librelogo \ -scp2/source/python/module_python_mailmerge \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp index 84d90af..5f9b410 100644 --- a/scp2/source/extensions/file_extensions.scp +++ b/scp2/source/extensions/file_extensions.scp @@ -282,24 +282,4 @@ End #endif -/* ** Script provider for Python ** */ - -#ifndef WITHOUT_SCRIPTING_PYTHON - -File gid_File_Py_Pythonscript -TXT_FILE_BODY; -Dir = gid_Brand_Dir_Program; -Name = pythonscript.py; -Styles = (PACKED); -End - -File gid_File_Rdb_Scriptproviderforpython -TXT_FILE_BODY; -Dir = gid_Brand_Dir_Program_Services; -Name = scriptproviderforpython.rdb; -Styles = (PACKED); -End - -#endif - #endif diff --git a/scp2/source/extensions/module_extensions.scp b/scp2/source/extensions/module_extensions.scp index 54612fb..84fac6b 100644 --- a/scp2/source/extensions/module_extensions.scp +++ b/scp2/source/extensions/module_extensions.scp @@ -317,22 +317,4 @@ End #endif -/* ** Script provider for Python ** */ - -#ifndef WITHOUT_SCRIPTING_PYTHON - -Module gid_Module_Optional_Extensions_Script_Provider_For_Python -PackageInfo = packinfo_extensions.txt; -MOD_NAME_DESC(MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON); -ParentID = gid_Module_Optional_Extensions; -Files = ( -gid_File_Py_Pythonscript, -gid_File_Rdb_Scriptproviderforpython ); -Minimal = NO; -Default = YES; -Styles = ( ); -End - -#endif - #endif diff --git a/scp2/source/extensions/module_extensions.ulf b/scp2/source/extensions/module_extensions.ulf index 27bdfc0..61618c0 100644 --- a/scp2/source/extensions/module_extensions.ulf +++ b/scp2/source/extensions/module_extensions.ulf @@ -140,9 +140,3 @@ en-US = Script provider for JavaScript [STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_JAVASCRIPT] en-US = Script provider for JavaScript - -[STR_NAME_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON] -en-US = Script provider for Python - -[STR_DESC_MODULE_OPTIONAL_EXTENSIONS_SCRIPT_PROVIDER_FOR_PYTHON] -en-US = Script provider for Python diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index f1f6048..630d32b 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -499,6 +499,12 @@ File gid_File_Wizards_Agenda ARCHIVE_TXT_FILE_BODY; Name = agenda.zip; End + +File gid_File_Pymailmerge +TXT_FILE_BODY; +Dir = gid_Brand_Dir_Program; +ARCHIVE_TXT_FILE_BODY; +Name = mailmerge.zip; #endif #endif diff --git
[Libreoffice-commits] core.git: 2 commits - writerfilter/source
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 51 +-
1 file changed, 31 insertions(+), 20 deletions(-)
New commits:
commit 6145c6efa4f346287ed9693c9d00038d829d5a35
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 20 16:32:59 2013 +0100
fdo#60789: writerfilter: do not insert a character at field start
The character inserted in DomainMapper_Impl::PushFieldContext() causes
problems in this bugdoc because there is a commentRangeStart immediately
before a text field and the call to delete it via setString() disposes
the SwXTextRange that is stored in m_aAnnotationPosition.m_xStart,
which results in an exception when trying to insert the comment.
At least all the fields in the bugdoc import fine with this change.
Change-Id: I6c08d72fafb0529e8612f1e35b2c8b871edb5a52
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index f5bc486..28ad154 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2035,10 +2035,7 @@ void DomainMapper_Impl::PushFieldContext()
uno::Reference text::XTextRange xStart;
if (xTextAppend.is())
{
-//insert a dummy char to make sure the start range doesn't move
together with the to-be-appended text
-xTextAppend-appendTextPortion(OUString( '-' ), uno::Sequence
beans::PropertyValue () );
uno::Reference text::XTextCursor xCrsr =
xTextAppend-createTextCursorByRange( xTextAppend-getEnd() );
-xCrsr-goLeft( 1, false );
xStart = xCrsr-getStart();
}
m_aFieldStack.push( FieldContextPtr( new FieldContext( xStart ) ) );
@@ -3312,9 +3309,6 @@ void DomainMapper_Impl::PopFieldContext()
try
{
uno::Reference text::XTextCursor xCrsr =
xTextAppend-createTextCursorByRange(pContext-GetStartRange());
-//remove the dummy character
-xCrsr-goRight( 1, true );
-xCrsr-setString( OUString() );
uno::Reference text::XTextContent xToInsert(
pContext-GetTOC(), uno::UNO_QUERY );
if( xToInsert.is() )
{
commit 4c165c708ce852b4d52527422b327b2f6ad73685
Author: Michael Stahl mst...@redhat.com
Date: Wed Feb 20 16:29:40 2013 +0100
fdo#60789: writerfilter: continue the import if comment insertion fails
Catch exceptions in DomainMapper_Impl::PopFieldContext().
Change-Id: Ia60857a5f773c9d89217991d481a5f20d0de3151
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index fe100ff..f5bc486 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1576,23 +1576,40 @@ void DomainMapper_Impl::PopAnnotation()
m_aTextAppendStack.pop();
-// See if the annotation will be a single position or a range.
-if (!m_aAnnotationPosition.m_xStart.is() ||
!m_aAnnotationPosition.m_xEnd.is())
+try
{
-uno::Sequence beans::PropertyValue aEmptyProperties;
-appendTextContent( uno::Reference text::XTextContent (
m_xAnnotationField, uno::UNO_QUERY_THROW ), aEmptyProperties );
+// See if the annotation will be a single position or a range.
+if (!m_aAnnotationPosition.m_xStart.is() ||
+!m_aAnnotationPosition.m_xEnd.is())
+{
+uno::Sequence beans::PropertyValue aEmptyProperties;
+appendTextContent(uno::Referencetext::XTextContent(
+m_xAnnotationField, uno::UNO_QUERY_THROW), aEmptyProperties);
+}
+else
+{
+// Create a range that points to the annotation start/end.
+uno::Referencetext::XText const xText =
+m_aAnnotationPosition.m_xStart-getText();
+uno::Referencetext::XTextCursor const xCursor =
+xText-createTextCursorByRange(m_aAnnotationPosition.m_xStart);
+xCursor-gotoRange(m_aAnnotationPosition.m_xEnd, true);
+uno::Referencetext::XTextRange const xTextRange(
+xCursor, uno::UNO_QUERY_THROW);
+
+// Attach the annotation to the range.
+uno::Referencetext::XTextAppend const xTextAppend =
+m_aTextAppendStack.top().xTextAppend;
+xTextAppend-insertTextContent(xTextRange,
+uno::Referencetext::XTextContent(m_xAnnotationField,
+uno::UNO_QUERY_THROW),
+!xCursor-isCollapsed());
+}
}
-else
+catch (uno::Exception const e)
{
-// Create a range that points to the annotation start/end.
-uno::Referencetext::XText xText =
m_aAnnotationPosition.m_xStart-getText();
-uno::Referencetext::XTextCursor xCursor =
xText-createTextCursorByRange(m_aAnnotationPosition.m_xStart);
-
Re: Need help for BUg 42893- Improve 'Capitalize first letter of sentence'
On Thu, 2013-02-14 at 23:51 +0530, Janit Anjaria wrote:
https://issues.apache.org/ooo/show_bug.cgi?id=73090
On Thu, Feb 14, 2013 at 11:44 PM, Janit Anjaria jani...@gmail.com
wrote:
I am hereby pasting the snipet of code which is on line
1332that is where i have added and commented it in the
file : editeng/source/misc/svxacorr.cxx
Its very hard to tell what you're trying to do from snippets of inline
code. Better is a a true patch with comments as to here I want to X.
Anyway, as far as I can see you just need to tweak
SvxAutoCorrect::FnCptlSttSntnc in editeng/source/misc/svxacorr.cxx which
is a fairly unreadable monster, but attached is a patch which should
help to indicate the right place to add the extra check for is this a
word which follows after a likely abbreviation
C.
From 32b4ed64f6759b101371f247ca1fe30e2410ad2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= caol...@redhat.com
Date: Wed, 20 Feb 2013 15:38:45 +
Subject: [PATCH] fdo#42893 help for improve capitalize first letter
Change-Id: If35064d9482d07695bd3343992cd3b914b96630e
---
editeng/source/misc/svxacorr.cxx | 15 +++
1 file changed, 15 insertions(+)
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 870d00b..c9b8bc9 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -910,6 +910,21 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc rDoc,
if( 2 ( pStr - pStart ) )
return sal_False;
+//start todo
+//*pStr is the end of the last sentence
+//pStr[6] = space
+//pStr[5] = r
+//pStr[4] = a
+//pStr[3] = b -- we're wondering if we should capitalize this
+//pStr[2] = space
+//pStr[1] = .
+//pStr[0] = o
+//pStr[-1] = . -- so if this is a . return false
+//pStr[-2] = o
+//pStr[-3] = .
+//pStr[-4] = F
+//end todo
+
if( !rCC.isLetterNumeric(
aText, sal::static_int_cast xub_StrLen ( pStr-- - pStart ) ) )
{
--
1.8.1.2
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
problem regarding setting up with gerrit
Hi, I am trying to setup myself with gerrit by following up the instructions in the documentation proveided on : https://wiki.documentfoundation.org/Development/gerrit/setup I have successfully setup the ssh key pair, and uploaded the public key in preferences. I've also created config as mentioned on the page. But the issue is, when I try to test the connection (in the LibO git directory), by doing : 'ssh logerrit', following is the message I get : elixir@ubuntu:~/lo$ ssh logerrit *Permission denied (publickey).* How should I proceed in this case. Any help shall be highly appreciable ! Thanks Prashant Pandey ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - icu/makefile.mk
icu/makefile.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit aeaa4fb859e2422a4952bda022e7a40ccbd86b9f Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Feb 20 16:54:45 2013 +0100 Don't cripple the icu data CorelDraw and MS Publisher importers use icu for conversions between 8-bit character sets and UTF8. In some cases even between UTF16 and UTF8. Thus we need the relevant data. Use the default icu-provided data for the while. Change-Id: I0f0f838cc3a0ce88b2d2a1bfd62b6c4ae98de9d3 Reviewed-on: https://gerrit.libreoffice.org/2296 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi diff --git a/icu/makefile.mk b/icu/makefile.mk index c92d9f9..fbe36fb 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -84,7 +84,8 @@ EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=0 # If you do that, upload a new subset data zip file with just the MD5 part of the name changed # appropriately. Let's not bother trying to list what stuff has been removed in the file name. # Describe it in the comment above instead. -CONFIGURE_ACTION=unzip $(TARFILE_LOCATION)/$(ICU_DATA_SUBSET_ZIP) mv icudt49l.dat data/in +#CONFIGURE_ACTION=unzip $(TARFILE_LOCATION)/$(ICU_DATA_SUBSET_ZIP) mv icudt49l.dat data/in +CONFIGURE_ACTION= .IF $(GUI)==UNX ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0-1' - icu/makefile.mk
icu/makefile.mk |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 6d9d3f52ae7dcd4428ab420f4c856b8046e0d1b5 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Feb 20 16:54:45 2013 +0100 Don't cripple the icu data CorelDraw and MS Publisher importers use icu for conversions between 8-bit character sets and UTF8. In some cases even between UTF16 and UTF8. Thus we need the relevant data. Use the default icu-provided data for the while. Change-Id: I0f0f838cc3a0ce88b2d2a1bfd62b6c4ae98de9d3 Reviewed-on: https://gerrit.libreoffice.org/2296 Reviewed-by: Tor Lillqvist t...@iki.fi Tested-by: Tor Lillqvist t...@iki.fi (cherry picked from commit aeaa4fb859e2422a4952bda022e7a40ccbd86b9f) Reviewed-on: https://gerrit.libreoffice.org/2297 Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Petr Mladek pmla...@suse.cz Tested-by: Petr Mladek pmla...@suse.cz diff --git a/icu/makefile.mk b/icu/makefile.mk index c92d9f9..fbe36fb 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -84,7 +84,8 @@ EXTRA_CDEFS+=-DU_HAVE_GCC_ATOMICS=0 # If you do that, upload a new subset data zip file with just the MD5 part of the name changed # appropriately. Let's not bother trying to list what stuff has been removed in the file name. # Describe it in the comment above instead. -CONFIGURE_ACTION=unzip $(TARFILE_LOCATION)/$(ICU_DATA_SUBSET_ZIP) mv icudt49l.dat data/in +#CONFIGURE_ACTION=unzip $(TARFILE_LOCATION)/$(ICU_DATA_SUBSET_ZIP) mv icudt49l.dat data/in +CONFIGURE_ACTION= .IF $(GUI)==UNX ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: linguistic/source
linguistic/source/dicimp.cxx | 74 ++-
1 file changed, 59 insertions(+), 15 deletions(-)
New commits:
commit 28300209604ee1bb8e5050322b29e95a07f679d8
Author: Michael Meeks michael.me...@suse.com
Date: Wed Feb 20 16:19:30 2013 +
fdo#42122 - truncate files that shrink to avoid dictionary corruption.
fixes a nasty apparently introduced by
7e01bc8d28ffefd4539a5eae2587e1f7da0999e7
Change-Id: I8227cb49a5dfa885d4dc38ce353a356bb5ed8a69
diff --git a/linguistic/source/dicimp.cxx b/linguistic/source/dicimp.cxx
index 2216a8c..9dc63e3 100644
--- a/linguistic/source/dicimp.cxx
+++ b/linguistic/source/dicimp.cxx
@@ -386,33 +386,75 @@ static rtl::OString formatForSave(const uno::Reference
XDictionaryEntry xEnt
return aStr.makeStringAndClear();
}
+struct TmpDictionary
+{
+OUString maURL, maTmpURL;
+uno::Reference ucb::XSimpleFileAccess3 mxAccess;
+
+void cleanTmpFile()
+{
+try
+{
+mxAccess-kill(maTmpURL);
+}
+catch (const uno::Exception ) { }
+}
+TmpDictionary(const OUString rURL)
+: maURL( rURL )
+{
+maTmpURL = maURL + .tmp;
+}
+~TmpDictionary()
+{
+cleanTmpFile();
+}
+
+uno::Reference io::XStream openTmpFile()
+{
+uno::Reference io::XStream xStream;
+
+try
+{
+mxAccess = ucb::SimpleFileAccess::create(
+comphelper::getProcessComponentContext());
+xStream = mxAccess-openFileReadWrite(maTmpURL);
+} catch (const uno::Exception ) { }
+
+return xStream;
+}
+
+bool renameTmpToURL()
+{
+try
+{
+mxAccess-move(maTmpURL, maURL);
+}
+catch (const uno::Exception )
+{
+DBG_ASSERT( 0, failed to overwrite dict );
+return static_cast sal_uLong (-1);
+}
+return 0;
+}
+};
sal_uLong DictionaryNeo::saveEntries(const OUString rURL)
{
-MutexGuard aGuard( GetLinguMutex() );
+MutexGuard aGuard( GetLinguMutex() );
if (rURL.isEmpty())
return 0;
DBG_ASSERT(!INetURLObject( rURL ).HasError(), lng : invalid URL);
-uno::Reference uno::XComponentContext xContext(
comphelper::getProcessComponentContext() );
+// lifecycle manage the .tmp file
+TmpDictionary aTmpDictionary(rURL);
+uno::Reference io::XStream xStream = aTmpDictionary.openTmpFile();
-// get XOutputStream stream
-uno::Reference io::XStream xStream;
-try
-{
-uno::Reference ucb::XSimpleFileAccess3 xAccess(
ucb::SimpleFileAccess::create(xContext) );
-xStream = xAccess-openFileReadWrite( rURL );
-}
-catch (const uno::Exception )
-{
-DBG_ASSERT( 0, failed to get input stream );
-}
if (!xStream.is())
return static_cast sal_uLong (-1);
-SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream(
xStream ) );
sal_uLong nErr = sal::static_int_cast sal_uLong (-1);
+SvStreamPtr pStream = SvStreamPtr( utl::UcbStreamHelper::CreateStream(
xStream ) );
//
// Always write as the latest version, i.e. DIC_VERSION_7
@@ -449,9 +491,11 @@ sal_uLong DictionaryNeo::saveEntries(const OUString rURL)
rtl::OString aOutStr = formatForSave(pEntry[i], eEnc);
pStream-WriteLine (aOutStr);
if (0 != (nErr = pStream-GetError()))
-return nErr;
+break;
}
+nErr = aTmpDictionary.renameTmpToURL();
+
//If we are migrating from an older version, then on first successful
//write, we're now converted to the latest version, i.e. DIC_VERSION_7
nDicVersion = DIC_VERSION_7;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: accessibility/inc dtrans/source jurt/com package/source sd/source svl/source svtools/source svx/source sw/source toolkit/inc unotools/source vbahelper/source vcl/aqua v
accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx |2 +- dtrans/source/win32/dtobj/FmtFilter.cxx |4 ++-- jurt/com/sun/star/comp/servicemanager/ServiceManager.java|2 +- package/source/xstor/xfactory.cxx|2 +- package/source/xstor/xstorage.cxx|4 ++-- sd/source/core/drawdoc2.cxx |2 +- sd/source/ui/inc/GraphicViewShell.hxx|2 +- sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx |2 +- sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx |2 +- sd/source/ui/unoidl/unolayer.hxx |2 +- sd/source/ui/view/drviewsa.cxx |2 +- sd/source/ui/view/grviewsh.cxx |2 +- sd/source/ui/view/sdwindow.cxx |2 +- svl/source/fsstor/fsfactory.cxx |2 +- svtools/source/control/valueacc.cxx |2 +- svx/source/dialog/fontwork.cxx |2 +- sw/source/ui/inc/view.hxx|4 ++-- sw/source/ui/uiview/view.cxx |2 +- sw/source/ui/vba/vbaformfield.cxx|2 +- sw/source/ui/vba/vbaheaderfooterhelper.cxx |2 +- toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx |2 +- unotools/source/i18n/textsearch.cxx |6 +++--- vbahelper/source/vbahelper/vbacommandbar.cxx |2 +- vcl/aqua/source/dtrans/HtmlFmtFlt.cxx|2 +- vcl/generic/fontmanager/parseAFM.cxx |2 +- vcl/unx/generic/app/saldisp.cxx |2 +- vcl/unx/generic/gdi/salgdi.cxx |2 +- xmloff/inc/xmloff/xmlerror.hxx |2 +- xmloff/source/draw/shapeexport2.cxx |2 +- 29 files changed, 34 insertions(+), 34 deletions(-) New commits: commit b37a07f2da6c4fcc1a01cc3ea547c558c23edd71 Author: Andras Timar ati...@suse.com Date: Wed Feb 20 17:24:33 2013 +0100 typo: allways - always Change-Id: I48bd0161dd76c36eeaa39c45e9539584a4ef6841 diff --git a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx index fe28f36..226fb01 100644 --- a/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/accessibility/standard/vclxaccessibletextfield.hxx @@ -31,7 +31,7 @@ typedef ::cppu::ImplHelper1 /** This class represents non editable text fields. The object passed to the constructor is expected to be a list (a typeListBox/type to be -more specific). From this allways the selected item is token to be made +more specific). From this always the selected item is token to be made accessible by this class. When the selected item changes then also the exported text changes. */ diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx index 66a43db..7456ce5 100644 --- a/dtrans/source/win32/dtobj/FmtFilter.cxx +++ b/dtrans/source/win32/dtobj/FmtFilter.cxx @@ -283,7 +283,7 @@ Sequence sal_Int8 SAL_CALL TextHtmlToHTMLFormat( Sequence sal_Int8 aTextH sal_uInt32 lHTMLFmtHdr = rtl_str_getLength( aHTMLFmtHdr ); -// the office allways writes the start +// the office always writes the start // and end html tag in upper cases and // without spaces // both tags don't allow parameters @@ -356,7 +356,7 @@ std::string GetHtmlFormatHeader(size_t startHtml, size_t endHtml, size_t startFr return htmlHeader.str(); } -// the office allways writes the start and end html tag in upper cases and +// the office always writes the start and end html tag in upper cases and // without spaces both tags don't allow parameters const std::string TAG_HTML = std::string(HTML); const std::string TAG_END_HTML = std::string(/HTML); diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java index 631d941..8e27e27 100644 --- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java +++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java @@ -881,7 +881,7 @@ class ServiceManagerFactory implements XServiceInfo, XSingleComponentFactory, X * because there is no the codeServiceManager/code has no constructor with * arguments. * p - * @return null - allways throws an exception + *
[Libreoffice-commits] core.git: icu/Module_icu.mk
icu/Module_icu.mk |1 - 1 file changed, 1 deletion(-) New commits: commit 9b60017d351858781aadc250a25e9784ef4a Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Wed Feb 20 17:32:02 2013 +0100 Don't cripple the icu data CorelDraw and MS Publisher importers use icu for conversions between 8-bit character sets and UTF8. In some cases even between UTF16 and UTF8. Thus we need the relevant data. Use the default icu-provided data for the while. Change-Id: I053b37d875cacc6eaf9637404639f330a34ddb50 diff --git a/icu/Module_icu.mk b/icu/Module_icu.mk index 524147b..46e02d3 100644 --- a/icu/Module_icu.mk +++ b/icu/Module_icu.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,icu)) ifeq ($(SYSTEM_ICU),NO) $(eval $(call gb_Module_add_targets,icu,\ UnpackedTarball_icu \ - UnpackedTarball_icu_data \ ExternalPackage_icu \ ExternalProject_icu \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: problem regarding setting up with gerrit
On Wed, Feb 20, 2013 at 9:53 AM, Prashant Pandey prashant3.yi...@gmail.com wrote: Hi, I am trying to setup myself with gerrit by following up the instructions in the documentation proveided on : https://wiki.documentfoundation.org/Development/gerrit/setup I have successfully setup the ssh key pair, and uploaded the public key in preferences. I've also created config as mentioned on the page. But the issue is, when I try to test the connection (in the LibO git directory), by doing : 'ssh logerrit', following is the message I get : elixir@ubuntu:~/lo$ ssh logerrit Permission denied (publickey). How should I proceed in this case. Any help shall be highly appreciable ! That means that there is a disconnect between what you told ssh in ~/.ssh/config and what gerrit knows For instance, did you tell gerrit (in your Setting on gerrit's web) what is your username (that must match the username you set in ~/.ssh/config for logerrit) did you place you ublic ssh key in gerrit (again in Stting)... did you do it correclty (cut-and-paste cand sometime mess up things) is the IdentityFile in the logerrit section in ~/.ssh/config point to the private key assocaited with the public key you uploaded in you gerrit profile ? did you forget the Port 29418 in ~/.ssh/config ? Norbert ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: odk/settings
odk/settings/settings.mk | 52 +++ 1 file changed, 22 insertions(+), 30 deletions(-) New commits: commit a14eedf997daf30379ceabc1933273360d4d3188 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Feb 20 17:49:20 2013 +0100 rhbz#742780: Let make OPT_FLAGS=... override SDK optimization/debugging flags Change-Id: I639fa16f74342b108a395d7d0335d116f96677f1 diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk index a71be27..eecde50 100644 --- a/odk/settings/settings.mk +++ b/odk/settings/settings.mk @@ -95,17 +95,16 @@ EMPTYSTRING= PATH_SEPARATOR=; # use this for release version -CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa -CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa +ifeq $(DEBUG) yes +OPT_FLAGS=-Zi +endif +CC_FLAGS_JNI=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS) +CC_FLAGS=-c -MT -Zm500 -Zc:forScope,wchar_t- -wd4251 -wd4275 -wd4290 -wd4675 -wd4786 -wd4800 -Zc:forScope -GR -EHa $(OPT_FLAGS) ifeq $(CPP_MANIFEST) true LINK_MANIFEST=mt -manifest $@.manifest -outputresource:$@;2 else LINK_MANIFEST= endif -ifeq $(DEBUG) yes -CC_FLAGS_JNI+=-Zi -CC_FLAGS+=-Zi -endif CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/win32 @@ -213,14 +212,13 @@ STORELIB=-lstore EMPTYSTRING= PATH_SEPARATOR=: -#CC_FLAGS_JNI=-c -KPIC -#CC_FLAGS=-c -KPIC -xldscope=hidden -CC_FLAGS_JNI=-c -fpic -CC_FLAGS=-c -fpic -fvisibility=hidden ifeq $(DEBUG) yes -CC_FLAGS_JNI+=-g -CC_FLAGS+=-g +OPT_FLAGS=-g endif +#CC_FLAGS_JNI=-c -KPIC $(OPT_FLAGS) +#CC_FLAGS=-c -KPIC -xldscope=hidden $(OPT_FLAGS) +CC_FLAGS_JNI=-c -fpic $(OPT_FLAGS) +CC_FLAGS=-c -fpic -fvisibility=hidden $(OPT_FLAGS) CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/solaris @@ -341,16 +339,14 @@ STORELIB=-lstore EMPTYSTRING= PATH_SEPARATOR=: -CC_FLAGS_JNI=-c -fpic -CC_FLAGS=-c -fpic -fvisibility=hidden # -O is necessary for inlining (see gcc documentation) ifeq $(DEBUG) yes -CC_FLAGS_JNI+=-g -CC_FLAGS+=-g +OPT_FLAGS=-g else -CC_FLAGS_JNI+=-O -CC_FLAGS+=-O +OPT_FLAGS=-O endif +CC_FLAGS_JNI=-c -fpic $(OPT_FLAGS) +CC_FLAGS=-c -fpic -fvisibility=hidden $(OPT_FLAGS) ifeq $(PROCTYPE) ppc CC_FLAGS+=-fPIC @@ -466,16 +462,14 @@ INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool -change @___ EMPTYSTRING= PATH_SEPARATOR=: -CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) -CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden # -O is necessary for inlining (see gcc documentation) ifeq $(DEBUG) yes -CC_FLAGS_JNI+=-g -CC_FLAGS+=-g +OPT_FLAGS=-g else -CC_FLAGS_JNI+=-O -CC_FLAGS+=-O +OPT_FLAGS=-O endif +CC_FLAGS_JNI=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) $(OPT_FLAGS) +CC_FLAGS=-malign-natural -c -fPIC -fno-common $(GCC_ARCH_OPTION) -fvisibility=hidden $(OPT_FLAGS) SDK_JAVA_INCLUDES = -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers -I/System/Library/Frameworks/JavaVM.framework/Headers CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include @@ -580,16 +574,14 @@ STORELIB=-lstore EMPTYSTRING= PATH_SEPARATOR=: -CC_FLAGS_JNI=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) -CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) -fvisibility=hidden # -O is necessary for inlining (see gcc documentation) ifeq $(DEBUG) yes -CC_FLAGS_JNI+=-g -CC_FLAGS+=-g +OPT_FLAGS=-g else -CC_FLAGS_JNI+=-O -CC_FLAGS+=-O +OPT_FLAGS=-O endif +CC_FLAGS_JNI=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) $(OPT_FLAGS) +CC_FLAGS=-c -g -fPIC -DPIC $(PTHREAD_CFLAGS) -fvisibility=hidden $(OPT_FLAGS) SDK_JAVA_INCLUDES = -I$(OO_SDK_JAVA_HOME)/include -I$(OO_SDK_JAVA_HOME)/include/freebsd CC_INCLUDES=-I. -I$(OUT)/inc -I$(OUT)/inc/examples -I$(PRJ)/include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/acceptrejectchanges.ui | 447 + 1 file changed, 447 insertions(+) New commits: commit 2cff4034576d1a0b1a3e7a3720a13ba654cc9312 Author: Abdulelah Alarifi asalar...@kacst.edu.sa Date: Sat Feb 2 11:40:58 2013 +0300 Converted Edit - Changes - Accept or reject Widget. Change-Id: I70f53ce73bf8e0c96b588fb15ec2a6bcd845e8da Reviewed-on: https://gerrit.libreoffice.org/1963 Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com diff --git a/cui/uiconfig/ui/acceptrejectchanges.ui b/cui/uiconfig/ui/acceptrejectchanges.ui new file mode 100644 index 000..64bff8e --- /dev/null +++ b/cui/uiconfig/ui/acceptrejectchanges.ui @@ -0,0 +1,447 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkAction id=action1/ + object class=GtkAction id=action2/ + object class=GtkWindow id=Accept or Reject Changes +property name=can_focusFalse/property +child + object class=GtkNotebook id=notebook1 +property name=visibleTrue/property +property name=can_focusTrue/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=GtkBox id=box2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +child + object class=GtkBox id=box3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=spacing30/property +child + object class=GtkLabel id=label3 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yesAction/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkLabel id=label4 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yesAuthor/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkLabel id=label5 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yesDate/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child +child + object class=GtkLabel id=label6 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=xalign0/property +property name=label translatable=yesComment/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position3/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkScrolledWindow id=scrolledwindow1 +property name=visibleTrue/property +property name=can_focusTrue/property +property name=shadow_typein/property +child +
[Libreoffice-commits] core.git: icu/Module_icu.mk
icu/Module_icu.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 68e4b28cb43287af3ef03da02de2f7347cbcfab3 Author: Stephan Bergmann sberg...@redhat.com Date: Wed Feb 20 18:41:22 2013 +0100 Revert Don't cripple the icu data This reverts commit 9b60017d351858781aadc250a25e9784ef4a, which caused build failures [build PAT] icu_data /bin/sh: line 0: cd: C:/lo/core/workdir/wntmsci13.pro/UnpackedTarball/icu_data: No such file or directory presumably because icu/UnpackedTarball_icu.mk explicitly references $(call gb_UnpackedTarball_get_target,icu_data). diff --git a/icu/Module_icu.mk b/icu/Module_icu.mk index 46e02d3..524147b 100644 --- a/icu/Module_icu.mk +++ b/icu/Module_icu.mk @@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,icu)) ifeq ($(SYSTEM_ICU),NO) $(eval $(call gb_Module_add_targets,icu,\ UnpackedTarball_icu \ + UnpackedTarball_icu_data \ ExternalPackage_icu \ ExternalProject_icu \ )) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
problem regarding setting up with gerrit
Hi, On Wed, Feb 20, 2013 at 10:10 PM, Norbert Thiebaud nthieb...@gmail.comwrote: On Wed, Feb 20, 2013 at 9:53 AM, Prashant Pandey prashant3.yi...@gmail.com wrote: Hi, I am trying to setup myself with gerrit by following up the instructions in the documentation provided on : https://wiki.documentfoundation.org/Development/gerrit/setup I have successfully setup the ssh key pair, and uploaded the public key in preferences. I've also created config as mentioned on the page. But the issue is, when I try to test the connection (in the LibO git directory), by doing : 'ssh logerrit', following is the message I get : elixir@ubuntu:~/lo$ ssh logerrit Permission denied (publickey). How should I proceed in this case. Any help shall be highly appreciable ! That means that there is a disconnect between what you told ssh in ~/.ssh/config and what gerrit knows For instance, did you tell gerrit (in your Setting on gerrit's web) yes. I cross-checked it thoroughly. what is your username (that must match the username you set in ~/.ssh/config for logerrit) its 'elixir'. (i've matched it at both the places carefully). did you place you ublic ssh key in gerrit (again in Stting)... did you do it correclty (cut-and-paste cand sometime mess up things) Yes. I used the 'xclip' utility, to make sure things go well. is the IdentityFile in the logerrit section in ~/.ssh/config point to the private key assocaited with the public key you uploaded in you gerrit profile ? yes. '~/.ssh/id_rsa' at 2 places in config file. did you forget the Port 29418 in ~/.ssh/config ? No. its clearly mentioned there. Norbert I am not convinced about what is getting wrong. Thanks Prashant ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[solved] Re: problem regarding setting up with gerrit
Hi Nobert, I just discovered out that I added the public key in my Github account as mentioned on the link, but I didn't add it in the setting page of my gerrit account, as correctly pointed out by you. Adding it, instantly made 'ssh logerrit' work as it should. :-) Thanks a lot for concern ! Regards Prashant. On Wed, Feb 20, 2013 at 11:27 PM, Prashant Pandey prashant3.yi...@gmail.com wrote: Hi, On Wed, Feb 20, 2013 at 10:10 PM, Norbert Thiebaud nthieb...@gmail.comwrote: On Wed, Feb 20, 2013 at 9:53 AM, Prashant Pandey prashant3.yi...@gmail.com wrote: Hi, I am trying to setup myself with gerrit by following up the instructions in the documentation proveided on : https://wiki.documentfoundation.org/Development/gerrit/setup I have successfully setup the ssh key pair, and uploaded the public key in preferences. I've also created config as mentioned on the page. But the issue is, when I try to test the connection (in the LibO git directory), by doing : 'ssh logerrit', following is the message I get : elixir@ubuntu:~/lo$ ssh logerrit Permission denied (publickey). How should I proceed in this case. Any help shall be highly appreciable ! That means that there is a disconnect between what you told ssh in ~/.ssh/config and what gerrit knows For instance, did you tell gerrit (in your Setting on gerrit's web) yes. I cross-cheecked it thoroughly. what is your username (that must match the username you set in ~/.ssh/config for logerrit) its 'elixir'. (i've matched it at both the places carefully). did you place you ublic ssh key in gerrit (again in Stting)... did you do it correclty (cut-and-paste cand sometime mess up things) Yes. I used the 'xclip' utility, to make sure things go well. is the IdentityFile in the logerrit section in ~/.ssh/config point to the private key assocaited with the public key you uploaded in you gerrit profile ? yes. '~/.ssh/id_rsa' at 2 places in config file. did you forget the Port 29418 in ~/.ssh/config ? No. its clearly mentioned there. Norbert I am not convinced about what is getting wrong. Thanks Prashant ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] FDO BSA Administration Info - New version 3.6.5.2 release
Version 4.0.1.1 rc has been added to FreeDesktop.Org (FDO) as well as to Bug Submission Assistant (BSA) in response to previous announcement made by Petr. Any questions send them my way Best Regards, Joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-qa] FDO BSA Administration Info - New version 4.0.1.1 rc
Forgot to edit subject, correction to previous email. My mistake Version 4.0.1.1 rc has been added to FreeDesktop.Org (FDO) as well as to Bug Submission Assistant (BSA) in response to previous announcement made by Petr. Any questions send them my way Best Regards, Joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: regarding patch 38838
On 17/02/13 22:52, Prashant Pandey wrote: Error: a unit test failed, please do one of: export DEBUGCPPUNIT=TRUE# for exception catching export GDBCPPUNITTRACE=gdb --args # for interactive debugging export VALGRIND=memcheck# for memory checking and retry. make[1]: *** [/home/elixir/lo/workdir/unxlngx6.pro/CppunitTest/sd_regression_test.test http://unxlngx6.pro/CppunitTest/sd_regression_test.test] Error 1 make[1]: *** Waiting for unfinished jobs Can't get rid of it and i don't have any clue too, please guide ! a unit test has failed. this is either a pre-existing problem in the LO code, a problem in the the test, or a problem in your modifications. you can try if it happens after you remove your changes with git stash save if make then runs all tests successfully but fails again after you do git stash pop then the most likely explanation is that your modifications introduced an error somewhere. you can debug the test by following the instructions in the message and running: GDBCPPUNITTRACE=gdb --args make /home/elixir/lo/workdir/unxlngx6.pro/CppunitTest/sd_regression_test.test ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Regression - LO Writer 4.0
I'm using LO version 4.0.1.1 (Build ID: 2c0c17a6e4bee0ee28131ea4bdc47edc700d659) since more than 3 hours on the same 262 pages long Writer document and the problem seems solved! LO 64 bits linux .deb version. Fluidity is back (like 3.6.x versions). I'll do the same check on win32 version when available. Raymond -- View this message in context: http://nabble.documentfoundation.org/Regression-LO-Writer-4-0-tp4038481p4038983.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/uiconfig tubes/uiconfig uui/uiconfig vcl/uiconfig xmlsecurity/uiconfig
sw/uiconfig/swriter/ui/autotext.ui |6 +- sw/uiconfig/swriter/ui/columndialog.ui |4 - sw/uiconfig/swriter/ui/splittable.ui |8 +- tubes/uiconfig/ui/contacts.ui | 62 +++-- uui/uiconfig/ui/masterpassworddlg.ui |2 vcl/uiconfig/ui/printdialog.ui | 51 ++--- xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui |5 - xmlsecurity/uiconfig/ui/macrosecuritydialog.ui |4 - xmlsecurity/uiconfig/ui/selectcertificatedialog.ui |4 - 9 files changed, 93 insertions(+), 53 deletions(-) New commits: commit 76bc43823a53d76e49260a601e893bc1a791fb03 Author: Caolán McNamara caol...@redhat.com Date: Wed Feb 20 20:21:30 2013 + various efforts to consistently apply HIG rules Change-Id: Ic55935d449cf69eb69da1be5bdb44d93f56f7d88 diff --git a/sw/uiconfig/swriter/ui/autotext.ui b/sw/uiconfig/swriter/ui/autotext.ui index 6689142..85c820f 100644 --- a/sw/uiconfig/swriter/ui/autotext.ui +++ b/sw/uiconfig/swriter/ui/autotext.ui @@ -3,13 +3,13 @@ !-- interface-requires gtk+ 3.0 -- object class=GtkDialog id=AutoTextDialog property name=can_focusFalse/property -property name=border_width5/property +property name=border_width6/property property name=title translatable=yesAutoText/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 property name=can_focusFalse/property -property name=spacing2/property +property name=spacing12/property child internal-child=action_area object class=GtkButtonBox id=dialog-action_area1 property name=can_focusFalse/property @@ -115,7 +115,7 @@ property name=can_focusFalse/property property name=hexpandTrue/property property name=vexpandTrue/property -property name=row_spacing6/property +property name=row_spacing12/property property name=column_spacing18/property child object class=GtkFrame id=frame1 diff --git a/sw/uiconfig/swriter/ui/columndialog.ui b/sw/uiconfig/swriter/ui/columndialog.ui index 914c626..73f23a0 100644 --- a/sw/uiconfig/swriter/ui/columndialog.ui +++ b/sw/uiconfig/swriter/ui/columndialog.ui @@ -3,13 +3,13 @@ !-- interface-requires gtk+ 3.0 -- object class=GtkDialog id=ColumnDialog property name=can_focusFalse/property -property name=border_width5/property +property name=border_width6/property property name=title translatable=yesColumns/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 property name=can_focusFalse/property -property name=spacing2/property +property name=spacing12/property child internal-child=action_area object class=GtkButtonBox id=dialog-action_area1 property name=can_focusFalse/property diff --git a/sw/uiconfig/swriter/ui/splittable.ui b/sw/uiconfig/swriter/ui/splittable.ui index 06b12ab..a10c5f1 100644 --- a/sw/uiconfig/swriter/ui/splittable.ui +++ b/sw/uiconfig/swriter/ui/splittable.ui @@ -3,14 +3,14 @@ !-- interface-requires gtk+ 3.0 -- object class=GtkDialog id=SplitTableDialog property name=can_focusFalse/property -property name=border_width5/property +property name=border_width6/property property name=title translatable=yesSplit Table/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 property name=can_focusFalse/property property name=orientationvertical/property -property name=spacing2/property +property name=spacing12/property child internal-child=action_area object class=GtkButtonBox id=dialog-action_area1 property name=can_focusFalse/property @@ -76,14 +76,14 @@ object class=GtkAlignment id=alignment1 property name=visibleTrue/property property name=can_focusFalse/property -property name=top_padding5/property +property name=top_padding6/property property name=left_padding12/property child object class=GtkGrid id=grid1 property name=visibleTrue/property property name=can_focusFalse/property property name=row_spacing6/property -property name=column_spacing5/property +property name=column_spacing6/property child object class=GtkRadioButton id=copyheading property name=label translatable=yesCopy heading/property diff --git a/tubes/uiconfig/ui/contacts.ui b/tubes/uiconfig/ui/contacts.ui index 5500c0d..25fc400
[Libreoffice-commits] core.git: avmedia/source
avmedia/source/gstreamer/gstframegrabber.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 116fdcfa2785fa0c04bbeb40042f0897f07e689c
Author: Stephan Bergmann sberg...@redhat.com
Date: Wed Feb 20 21:24:49 2013 +0100
-Werror,-Wsign-compare
Change-Id: Id240e2eb51e3ac40f13f813386a21e97ab1e9ff1
diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx
b/avmedia/source/gstreamer/gstframegrabber.cxx
index ed998dd..90b388d 100644
--- a/avmedia/source/gstreamer/gstframegrabber.cxx
+++ b/avmedia/source/gstreamer/gstframegrabber.cxx
@@ -158,7 +158,7 @@ uno::Reference graphic::XGraphic SAL_CALL
FrameGrabber::grabFrame( double fMe
#ifdef AVMEDIA_GST_0_10
GST_BUFFER_SIZE( pBuf ) = static_castunsigned( nWidth * nHeight * 3
)
#else
-gst_buffer_get_size( pBuf ) = ( nWidth * nHeight * 3 )
+gst_buffer_get_size( pBuf ) = static_castunsigned( nWidth * nHeight
* 3 )
#endif
)
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Re: New feature in Calc: Stepped Lines graphs
On Wednesday 20 February 2013 14:04:12 Jan Holesovsky wrote: If you want to have user experience input on the changes, the best is to involve the guys at libreoffice-ux-adv...@lists.freedesktop.org, either to check what you have already done, or to work with them on the design. I'll do that once I have a mockup. Please let us know when you have finalized the patch by sending a [PATCH] mail to this ML, or via gerrit. And of course, should you have any questions, just ask, or reach us at the IRC (#libreoffice-dev at irc.freenode.net). Will do. Thanks for the compliment as well Jan. This makes me want to do more :-) Eric___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Gdb support for exceptions (Re: using backtrace() in exception throwing?)
Lubos == Lubos Lunak l.lu...@suse.cz writes:
Tom Is there something we could do to improve it?
Lubos I don't know how much control gdb over exception handling has,
Lubos so I don't know :).
:-)
FWIW we have the same problem in reverse: the gdb group at Red Hat is,
among other things, tasked with improving the C++ debugging experience.
However, most of us don't actually debug C++ programs on a regular
basis. We do know some issues, via bugzilla and other discussions, but
I feel sure we are also missing things.
Lubos What I was refering to was the problem that if a catch block
Lubos catches an exception, it's often difficult to find out where it
Lubos actually came from. Using 'catch catch' doesn't show where it
Lubos originated (unless I missed a non-obvious way). And if the
Lubos exception propagated out of complex nesting of function calls,
Lubos then 'catch throw' may trigger a number of times for exceptions
Lubos that will be handled elsewhere.
Solving this in general looks tricky to me. I am not really sure how to
do it, but I will think about it some more.
The basic issue is that if 'catch throw' triggers multiple times for the
same exception, then it seems that there must be code that catches the
exception and then throws it again:
try { } catch (blah) { throw blah; }
As opposed to a true re-throw:
try { } catch (blah) { throw; }
AFAIK re-throws are currently not caught, see
http://sourceware.org/bugzilla/show_bug.cgi?id=12824
I'm not sure whether it is possible to easily detect whether throw x
is throwing some object which has already been thrown.
Hopefully I'm misunderstanding the problem :)
Meanwhile, I did whip up a quick-and-dirty Python-based approach. It
adds a new track-throws command. This command installs a breakpoint
that records the point of the most recent throw. Then you can examine
the result with info last-throw.
Here it is in action:
(gdb) source track_throw.py
(gdb) track-throws
Breakpoint 1 at 0x400910
(gdb) catch catch
Catchpoint 2 (catch)
(gdb) run
[...]
Catchpoint 2 (exception caught), __cxxabiv1::__cxa_begin_catch (
exc_obj_in=0x602070) at ../../../../libstdc++-v3/libsupc++/eh_catch.cc:41
41 {
(gdb) info last-throw
Last exception thrown at file
../../../archer/gdb/testsuite/gdb.cp/nextoverthrow.cc, line 36
track-throws makes the breakpoint it installs user-visible so you can
disable the feature simply by deleting the breakpoint.
I'm curious to know if this is useful to you.
Tom
import gdb
last_sal = None
throw_bp = None
class ThrowTracker(gdb.Breakpoint):
def __init__(self):
gdb.Breakpoint.__init__(self, '__cxa_throw')
def stop(self):
global last_sal
frame = gdb.newest_frame().older()
last_sal = frame.find_sal()
return False
class TrackThrows(gdb.Command):
def __init__(self):
gdb.Command.__init__(self, 'track-throws', gdb.COMMAND_BREAKPOINTS)
def invoke(self, arg, from_tty):
global throw_bp
if throw_bp is None or not throw_bp.is_valid():
# Still no good way to create a pending breakpoint from
# Python.
save = gdb.parameter('breakpoint pending')
gdb.execute('set breakpoint pending on', to_string = True)
throw_bp = ThrowTracker()
if save is None:
arg = 'auto'
elif save:
arg = 'on'
else:
arg = 'off'
gdb.execute('set breakpoint pending %s' % arg, to_string = True)
class InfoThrow(gdb.Command):
def __init__(self):
gdb.Command.__init__(self, 'info last-throw', gdb.COMMAND_BREAKPOINTS)
def invoke(self, arg, from_tty):
global last_sal
if last_sal is not None:
filename = last_sal.symtab.filename
line = last_sal.line
print Last exception thrown at file %s, line %d % (filename, line)
else:
print No previous exception seen
TrackThrows()
InfoThrow()
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
server outage tomorrow 0900 UTC
Hello, once again, a hard disk in our mail, mailing list and download server crashed. Tomorrow, Thursday, at 0900 UTC, our ISP will check and if needed replace the hard disk. We will experience a downtime of about 30-90 minutes for the mentioned services. Sorry for those inconveniences - we plan to separate several services soon, to avoid those kind of outages. For questions, please write to hostmas...@documentfoundation.org or - during the outage - on #tdf-infra at Freenode. Thanks to Alin for investigating the problem! Florian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Contributions license
All of my past future contributions to LibreOffice may be licensed under the MPL/LGPLv3+ dual license -- Jordi Mas i Hernàndez -Bloc: http://gent.softcatala.org/jmas/bloc/ Planet Softcatalà - http://planeta.softcatala.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/source sfx2/source sw/source vcl/source
desktop/source/app/appinit.cxx |5 +
desktop/source/deployment/gui/dp_gui_updatedata.hxx |2 +-
sfx2/source/doc/doctempl.cxx|3 +--
sw/source/ui/misc/pgfnote.cxx |3 +--
vcl/source/glyphs/graphite_layout.cxx |3 +--
5 files changed, 5 insertions(+), 11 deletions(-)
New commits:
commit eda11cbfaf974905183ea10e4ffa89b90a401d98
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Feb 20 22:38:38 2013 +0100
Some cppcheck cleaning
Change-Id: I0b9d3b5f8283e2fddc96b220a755ba6bcdd11606
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index cbb7a32..d16cdcc 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -123,14 +123,11 @@ void Desktop::RegisterServices(Reference
XComponentContext const context)
{
RTL_LOGFILE_CONTEXT( aLog, desktop (cd13) ::registerServices );
-// read command line parameters
-sal_BoolbHeadlessMode = sal_False;
-
// interpret command line arguments
CommandLineArgs rCmdLine = GetCommandLineArgs();
// Headless mode for FAT Office
-bHeadlessMode = rCmdLine.IsHeadless();
+sal_Bool bHeadlessMode = rCmdLine.IsHeadless();
if ( bHeadlessMode )
Application::EnableHeadlessMode(false);
diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
index 870227e..d611947 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx
@@ -40,7 +40,7 @@ namespace dp_gui {
struct UpdateData
{
UpdateData( ::com::sun::star::uno::Reference
::com::sun::star::deployment::XPackage const aExt):
-bIsShared(false), aInstalledPackage(aExt){};
+bIsShared(false), aInstalledPackage(aExt), aUpdateSource(NULL),
m_nID(0), m_bIgnored(false){};
//When entries added to the listbox then there can be one for the user
update and one
//for the shared update. However, both list entries will contain the same
UpdateData.
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 9c171ee..4d8ea07 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -1048,7 +1048,6 @@ sal_Bool SfxDocumentTemplates::SetName( const OUString
rName, sal_uInt16 nRegio
return sal_False;
RegionData_Impl *pRegion = pImp-GetRegion( nRegion );
-DocTempl_EntryData_Impl *pEntry = NULL;
if ( !pRegion )
return sal_False;
@@ -1072,7 +1071,7 @@ sal_Bool SfxDocumentTemplates::SetName( const OUString
rName, sal_uInt16 nRegio
}
else
{
-pEntry = pRegion-GetEntry( nIdx );
+DocTempl_EntryData_Impl *pEntry = pRegion-GetEntry( nIdx );
if ( !pEntry )
return sal_False;
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 7cb69a4..c369b2b 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -221,14 +221,13 @@ void SwFootNotePage::Reset(const SfxItemSet rSet)
// Separator Color
SfxObjectShell* pDocSh = SfxObjectShell::Current();
-const SfxPoolItem* pColorItem = NULL;
XColorListRef pColorList;
OSL_ENSURE( pDocSh, DocShell not found! );
if ( pDocSh )
{
-pColorItem = pDocSh-GetItem( SID_COLOR_TABLE );
+const SfxPoolItem* pColorItem = pDocSh-GetItem( SID_COLOR_TABLE );
if ( pColorItem != NULL )
pColorList = ( (SvxColorListItem*)pColorItem )-GetColorList();
}
diff --git a/vcl/source/glyphs/graphite_layout.cxx
b/vcl/source/glyphs/graphite_layout.cxx
index 7b663bd..5183c71 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -526,11 +526,10 @@ void GraphiteLayout::clear()
// This method shouldn't be called on windows, since it needs the dc reset
bool GraphiteLayout::LayoutText(ImplLayoutArgs rArgs)
{
-gr_segment * pSegment = NULL;
bool success = true;
if (rArgs.mnMinCharPos rArgs.mnEndCharPos)
{
-pSegment = CreateSegment(rArgs);
+gr_segment * pSegment = CreateSegment(rArgs);
if (!pSegment)
return false;
success = LayoutGlyphs(rArgs, pSegment);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 Rainer Bielefeld libreoff...@bielefeldundbuss.de changed: What|Removed |Added Depends on||61187 --- Comment #4 from Rainer Bielefeld libreoff...@bielefeldundbuss.de --- I add Bug 61187 - CRASH when click 'Add' in EXTENSIONS Manager -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: scripting/Module_scripting.mk
scripting/Module_scripting.mk |4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) New commits: commit b0e42ed2985a5a00d8523139b1ffd1e72c747304 Author: David Ostrovsky da...@ostrovsky.org Date: Wed Feb 20 22:42:02 2013 +0100 fix build breakage: ENABLE_SCRIPTING_PYTHON was already removed Change-Id: I22cfcb848fbf7e9568fd4e2a43994ed361a8e1a7 diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk index 3243ba9..7beadf5 100644 --- a/scripting/Module_scripting.mk +++ b/scripting/Module_scripting.mk @@ -47,9 +47,7 @@ $(eval $(call gb_Module_add_targets,scripting,\ ) \ Zip_ScriptsJava \ ) \ - $(if $(filter $(ENABLE_SCRIPTING_PYTHON),YES),\ - Package_scriptproviderforpython \ - ) \ + Package_scriptproviderforpython \ Library_basprov \ Library_dlgprov \ Library_protocolhandler \ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[PATCH] convert odk to gbuild and add to tail_build
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2288 to look at the new patch set (#2). Change subject: convert odk to gbuild and add to tail_build .. convert odk to gbuild and add to tail_build Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 --- M Module_tail_build.mk M Repository.mk M RepositoryModule_ooo.mk A odk/CustomTarget_check.mk A odk/CustomTarget_gendocu.mk A odk/CustomTarget_javadollar.mk A odk/CustomTarget_odkcommon.mk A odk/CustomTarget_unowinreg.mk A odk/Executable_unoapploader.mk A odk/Library_unowinreg.mk A odk/Makefile A odk/Module_odk.mk A odk/Zip_odkcommon.mk A odk/Zip_odkexamples.mk A odk/Zip_uno_loader_classes.mk R odk/config/cfgWin.js R odk/config/configure.pl R odk/config/setsdkenv_unix R odk/config/setsdkenv_unix.csh.in R odk/config/setsdkenv_unix.sh.in R odk/config/setsdkenv_windows.bat R odk/config/setsdkenv_windows.template R odk/config/setsdkname.bat D odk/inc/makefile.mk D odk/pack/checkbin/makefile.mk D odk/pack/checkidl/makefile.mk D odk/pack/checkinc/makefile.mk D odk/pack/checkinc2/makefile.mk D odk/pack/copying/makefile.mk D odk/pack/gendocu/makefile.mk D odk/pack/unzip_udk/deltree.txt D odk/pack/unzip_udk/makefile.mk M odk/prj/build.lst M odk/prj/d.lst D odk/prj/dmake D odk/source/com/sun/star/lib/loader/makefile.mk D odk/source/unoapploader/unx/makefile.mk D odk/source/unoapploader/win/makefile.mk D odk/source/unowinreg/win/makefile.mk D odk/source/unowinreg/win/unowinreg.dxp D odk/util/delzip D odk/util/makefile.mk D odk/util/makefile.pmk D odk/util/odk_rules.pmk M postprocess/prj/build.lst M solenv/gbuild/Zip.mk 46 files changed, 966 insertions(+), 1,468 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2288/2 -- To view, visit https://gerrit.libreoffice.org/2288 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] convert odk to gbuild and add to tail_build
Hello LibreOffice gerrit bot, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2288 to look at the new patch set (#3). Change subject: convert odk to gbuild and add to tail_build .. convert odk to gbuild and add to tail_build Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 --- M Module_tail_build.mk M Repository.mk M RepositoryModule_ooo.mk A odk/CustomTarget_check.mk A odk/CustomTarget_gendocu.mk A odk/CustomTarget_javadollar.mk A odk/CustomTarget_odkcommon.mk A odk/CustomTarget_unowinreg.mk A odk/Executable_unoapploader.mk A odk/Library_unowinreg.mk A odk/Makefile A odk/Module_odk.mk A odk/Zip_odkcommon.mk A odk/Zip_odkexamples.mk A odk/Zip_uno_loader_classes.mk R odk/config/cfgWin.js R odk/config/configure.pl R odk/config/setsdkenv_unix R odk/config/setsdkenv_unix.csh.in R odk/config/setsdkenv_unix.sh.in R odk/config/setsdkenv_windows.bat R odk/config/setsdkenv_windows.template R odk/config/setsdkname.bat D odk/inc/makefile.mk D odk/pack/checkbin/makefile.mk D odk/pack/checkidl/makefile.mk D odk/pack/checkinc/makefile.mk D odk/pack/checkinc2/makefile.mk D odk/pack/copying/makefile.mk D odk/pack/gendocu/makefile.mk D odk/pack/unzip_udk/deltree.txt D odk/pack/unzip_udk/makefile.mk M odk/prj/build.lst M odk/prj/d.lst D odk/prj/dmake D odk/source/com/sun/star/lib/loader/makefile.mk D odk/source/unoapploader/unx/makefile.mk D odk/source/unoapploader/win/makefile.mk D odk/source/unowinreg/win/makefile.mk D odk/source/unowinreg/win/unowinreg.dxp D odk/util/delzip D odk/util/makefile.mk D odk/util/makefile.pmk D odk/util/odk_rules.pmk M postprocess/prj/build.lst M solenv/gbuild/Zip.mk 46 files changed, 966 insertions(+), 1,468 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2288/3 -- To view, visit https://gerrit.libreoffice.org/2288 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 Gerrit-PatchSet: 3 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: canvas/source
canvas/source/directx/dx_9rm.cxx| 17 +
canvas/source/directx/dx_canvas.cxx | 23 +++
canvas/source/directx/dx_canvasbitmap.cxx | 12 ++--
canvas/source/directx/dx_canvascustomsprite.cxx | 12 ++--
canvas/source/directx/dx_canvasfont.cxx | 12 ++--
canvas/source/directx/dx_config.cxx | 15 +++
canvas/source/directx/dx_spritecanvas.cxx |9 +++--
canvas/source/directx/dx_spritedevicehelper.cxx |9 ++---
canvas/source/directx/dx_textlayout.cxx | 12 ++--
9 files changed, 48 insertions(+), 73 deletions(-)
New commits:
commit 73f866aa6161146d2a96e3e9b65ce18ca25ca2c5
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Tue Feb 19 19:49:47 2013 +0100
RTL_CONSTASCII_USTRINGPARAM and ::rtl:: removals
All RTL_CONSTASCII_USTRINGPARAMs removed from canvas
Change-Id: Ie62d080eb58a05f7bb18aa1cc2f518c951145460
Reviewed-on: https://gerrit.libreoffice.org/2283
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index b30b0a4..e62a29f 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -585,9 +585,7 @@ namespace dxcanvas
if(!(create(rWindow)))
{
-throw lang::NoSupportException(
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- Could not create DirectX device!)
),NULL);
+throw lang::NoSupportException( Could not create DirectX
device! ,NULL);
}
// allocate a single texture surface which can be used later.
@@ -606,9 +604,7 @@ namespace dxcanvas
(aPageSize.getY() MIN_TEXTURE_SIZE))
{
throw lang::NoSupportException(
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-Could not create DirectX device -
-insufficient texture space!)
),NULL);
+Could not create DirectX device - insufficient
texture space!, NULL );
}
}
maPageSize=aPageSize;
@@ -623,8 +619,7 @@ namespace dxcanvas
NULL)) )
{
throw lang::NoSupportException(
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- Could not create DirectX device -
out of memory!)),NULL);
+Could not create DirectX device - out of memory!, NULL );
}
mpVertexBuffer=COMReferenceIDirect3DVertexBuffer9(pVB);
@@ -905,8 +900,7 @@ namespace dxcanvas
NULL)) )
{
throw lang::NoSupportException(
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- Could not create offscreen surface -
out of mem!) ),NULL);
+Could not create offscreen surface - out of mem!, NULL );
}
return COMReferenceIDirect3DSurface9(pSurface);
@@ -960,8 +954,7 @@ namespace dxcanvas
NULL)) )
{
throw lang::NoSupportException(
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- Could not create DirectX
device - out of memory!)),NULL);
+Could not create DirectX device - out of
memory!, NULL );
}
mpVertexBuffer=COMReferenceIDirect3DVertexBuffer9(pVB);
diff --git a/canvas/source/directx/dx_canvas.cxx
b/canvas/source/directx/dx_canvas.cxx
index 6fa20be..602224b 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -96,10 +96,7 @@ namespace dxcanvas
const SystemGraphicsData* pSysData=reinterpret_castconst
SystemGraphicsData*(aSeq.getConstArray());
if( !pSysData || !pSysData-hDC )
-throw lang::NoSupportException(
-::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- Passed SystemGraphicsData or HDC
invalid!)),
-NULL);
+throw lang::NoSupportException( Passed SystemGraphicsData or HDC
invalid! ), NULL);
// setup helper
maDeviceHelper.init( pSysData-hDC,
@@ -123,9 +120,9 @@ namespace dxcanvas
CanvasBaseT::disposeThis();
}
-::rtl::OUString SAL_CALL Canvas::getServiceName( ) throw
(uno::RuntimeException)
+OUString SAL_CALL Canvas::getServiceName( ) throw (uno::RuntimeException)
[Libreoffice-commits] core.git: filter/source
filter/source/pdf/impdialog.cxx | 208 +++---
filter/source/pdf/pdfdialog.cxx |6 -
filter/source/pdf/pdfexport.cxx | 52 -
filter/source/pdf/pdffilter.cxx | 70 ++--
filter/source/pdf/pdfinteract.cxx |4
5 files changed, 169 insertions(+), 171 deletions(-)
New commits:
commit 1a5c827302bfa0f6fcc5d2e6a6fcbf52c370455d
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Tue Feb 19 21:15:40 2013 +0100
RTL_CONSTASCII_USTRINGPARAM removals
All RTL_CONSTASCII_USTRINGPARAM removed from filter/source/pdf
Change-Id: Ic4a5ae8ca8476a1498e7fca5a06c4f465d45749b
Reviewed-on: https://gerrit.libreoffice.org/2284
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index e9e16e2..b95f341 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -67,8 +67,8 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
) :
SfxTabDialog( pParent, PDFFilterResId( RID_PDF_EXPORT_DLG ), 0, sal_False,
0 ),
mxMSF( xFact ),
-maConfigItem( String( RTL_CONSTASCII_USTRINGPARAM(
Office.Common/Filter/PDF/Export/ ) ), rFilterData ),
-maConfigI18N( String( RTL_CONSTASCII_USTRINGPARAM(
Office.Common/I18N/CTL/ ) ) ),
+maConfigItem( Office.Common/Filter/PDF/Export/, rFilterData ),
+maConfigI18N( Office.Common/I18N/CTL/ ),
mbIsPresentation( sal_False ),
mbIsWriter( sal_False ),
@@ -169,9 +169,9 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
Reference XServiceInfo xInfo( rxDoc, UNO_QUERY );
if ( xInfo.is() )
{
-if ( xInfo-supportsService( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.presentation.PresentationDocument )
) ) )
+if ( xInfo-supportsService(
com.sun.star.presentation.PresentationDocument ) )
mbIsPresentation = sal_True;
-if ( xInfo-supportsService( rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( com.sun.star.text.GenericTextDocument ) ) ) )
+if ( xInfo-supportsService(
com.sun.star.text.GenericTextDocument ) )
mbIsWriter = sal_True;
}
}
@@ -180,68 +180,68 @@ ImpPDFTabDialog::ImpPDFTabDialog( Window* pParent,
}
//get the CTL (Complex Text Layout) from general options, returns sal_True if
we have a CTL font on our hands.
-mbUseCTLFont = maConfigI18N.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( CTLFont ) ), sal_False );
+mbUseCTLFont = maConfigI18N.ReadBool( CTLFont, sal_False );
-mbUseLosslessCompression = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( UseLosslessCompression ) ), sal_False );
-mnQuality = maConfigItem.ReadInt32( OUString( RTL_CONSTASCII_USTRINGPARAM(
Quality ) ), 90 );
-mbReduceImageResolution = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( ReduceImageResolution ) ), sal_False );
-mnMaxImageResolution = maConfigItem.ReadInt32( OUString(
RTL_CONSTASCII_USTRINGPARAM( MaxImageResolution ) ), 300 );
+mbUseLosslessCompression = maConfigItem.ReadBool(
UseLosslessCompression, sal_False );
+mnQuality = maConfigItem.ReadInt32( Quality, 90 );
+mbReduceImageResolution = maConfigItem.ReadBool( ReduceImageResolution,
sal_False );
+mnMaxImageResolution = maConfigItem.ReadInt32( MaxImageResolution, 300 );
-mbUseTaggedPDF = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( UseTaggedPDF ) ), sal_False );
-mnPDFTypeSelection = maConfigItem.ReadInt32( OUString(
RTL_CONSTASCII_USTRINGPARAM( SelectPdfVersion ) ), 0 );
+mbUseTaggedPDF = maConfigItem.ReadBool( UseTaggedPDF, sal_False );
+mnPDFTypeSelection = maConfigItem.ReadInt32( SelectPdfVersion, 0 );
if ( mbIsPresentation )
-mbExportNotesPages = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( ExportNotesPages ) ), sal_False );
-mbExportNotes = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( ExportNotes ) ), sal_False );
+mbExportNotesPages = maConfigItem.ReadBool( ExportNotesPages,
sal_False );
+mbExportNotes = maConfigItem.ReadBool( ExportNotes, sal_False );
-mbExportBookmarks = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( ExportBookmarks ) ), sal_True );
+mbExportBookmarks = maConfigItem.ReadBool( ExportBookmarks, sal_True );
if ( mbIsPresentation )
-mbExportHiddenSlides = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( ExportHiddenSlides ) ), sal_False );
-mnOpenBookmarkLevels = maConfigItem.ReadInt32( OUString(
RTL_CONSTASCII_USTRINGPARAM( OpenBookmarkLevels ) ), -1 );
-mbUseTransitionEffects = maConfigItem.ReadBool( OUString(
RTL_CONSTASCII_USTRINGPARAM( UseTransitionEffects ) ), sal_True );
-mbIsSkipEmptyPages = maConfigItem.ReadBool( OUString(
[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source
sd/source/ui/remotecontrol/BufferedStreamSocket.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 216257e8777c5cd2fe2ef68bfa6a1a953eb923be Author: Tor Lillqvist t...@iki.fi Date: Tue Feb 19 19:57:12 2013 +0200 Avoid infinite recursion (cherry picked from commit 0d05957cf0c38abab45030ba172025e4ef318f43) Change-Id: I99d26f9601ceed98d0357d8722f8cf91cf007d29 Reviewed-on: https://gerrit.libreoffice.org/2268 Reviewed-by: Eike Rathke er...@redhat.com Reviewed-by: Michael Stahl mst...@redhat.com Tested-by: Michael Stahl mst...@redhat.com diff --git a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx index e2c7a4a..dcec4e3 100644 --- a/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx +++ b/sd/source/ui/remotecontrol/BufferedStreamSocket.cxx @@ -67,7 +67,7 @@ void BufferedStreamSocket::close() mSocket = -1; } else -close(); +::osl::StreamSocket::close(); } sal_Int32 BufferedStreamSocket::readLine( OString aLine ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: filter/source
filter/source/config/cache/macros.hxx |4 -
filter/source/flash/impswfdialog.cxx | 20 +++
filter/source/graphicfilter/epbm/epbm.cxx |2
filter/source/graphicfilter/epgm/epgm.cxx |2
filter/source/graphicfilter/eppm/eppm.cxx |2
filter/source/graphicfilter/icgm/cgm.cxx |2
filter/source/graphicfilter/ieps/ieps.cxx | 78 +++---
7 files changed, 46 insertions(+), 64 deletions(-)
New commits:
commit 9a8cc22f88b1274b2f254c6f6adf1ad76b8304dd
Author: Krisztian Pinter pin.termina...@gmail.com
Date: Tue Feb 19 21:45:07 2013 +0100
RTL_CONSTASCII_USTRINGPARAM removals
Change-Id: I389c863f7ea83071a3d3b43a33f505e9e1ce7d16
Reviewed-on: https://gerrit.libreoffice.org/2285
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com
diff --git a/filter/source/config/cache/macros.hxx
b/filter/source/config/cache/macros.hxx
index a308f1f..4c7c84a 100644
--- a/filter/source/config/cache/macros.hxx
+++ b/filter/source/config/cache/macros.hxx
@@ -33,10 +33,10 @@
#endif
#define _FILTER_CONFIG_FROM_ASCII_(ASCII_STRING)\
-::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ASCII_STRING))
+OUString(ASCII_STRING)
#define _FILTER_CONFIG_TO_ASCII_(UNICODE_STRING)\
-::rtl::OUStringToOString(UNICODE_STRING,
RTL_TEXTENCODING_UTF8).getStr()
+OUStringToOString(UNICODE_STRING, RTL_TEXTENCODING_UTF8).getStr()
#define _FILTER_CONFIG_LOG_(TEXT)
#define _FILTER_CONFIG_LOG_1_(FORMAT, ARG1)
diff --git a/filter/source/flash/impswfdialog.cxx
b/filter/source/flash/impswfdialog.cxx
index 05f0677..18f74ec 100644
--- a/filter/source/flash/impswfdialog.cxx
+++ b/filter/source/flash/impswfdialog.cxx
@@ -52,9 +52,9 @@ ImpSWFDialog::ImpSWFDialog( Window* pParent, ResMgr rResMgr,
Sequence Property
maBtnOK( this, ResId( BTN_OK, rResMgr ) ),
maBtnCancel( this, ResId( BTN_CANCEL, rResMgr ) ),
maBtnHelp( this, ResId( BTN_HELP, rResMgr ) ),
-maConfigItem( String( RTL_CONSTASCII_USTRINGPARAM(
Office.Common/Filter/Flash/Export/ ) ), rFilterData )
+maConfigItem( Office.Common/Filter/Flash/Export/, rFilterData )
{
-const sal_uLong nCompressMode = maConfigItem.ReadInt32( String(
RTL_CONSTASCII_USTRINGPARAM( CompressMode ) ), 75 );
+const sal_uLong nCompressMode = maConfigItem.ReadInt32( CompressMode, 75
);
maNumFldQuality.SetValue( nCompressMode );
maCheckExportAll.Check();
@@ -85,14 +85,14 @@ ImpSWFDialog::~ImpSWFDialog()
Sequence PropertyValue ImpSWFDialog::GetFilterData()
{
sal_Int32 nCompressMode = (sal_Int32)maNumFldQuality.GetValue();
-maConfigItem.WriteInt32( OUString( RTL_CONSTASCII_USTRINGPARAM(
CompressMode ) ), nCompressMode );
-maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( ExportAll
) ), maCheckExportAll.IsChecked() );
-maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
ExportBackgrounds ) ), maCheckExportBackgrounds.IsChecked() );
-maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
ExportBackgroundObjects ) ), maCheckExportBackgroundObjects.IsChecked() );
-maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
ExportSlideContents ) ), maCheckExportSlideContents.IsChecked() );
-maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
ExportSound ) ), maCheckExportSound.IsChecked() );
-maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
ExportOLEAsJPEG ) ), maCheckExportOLEAsJPEG.IsChecked() );
-maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM(
ExportMultipleFiles ) ), maCheckExportMultipleFiles.IsChecked() );
+maConfigItem.WriteInt32( CompressMode , nCompressMode );
+maConfigItem.WriteBool( ExportAll, maCheckExportAll.IsChecked() );
+maConfigItem.WriteBool( ExportBackgrounds,
maCheckExportBackgrounds.IsChecked() );
+maConfigItem.WriteBool( ExportBackgroundObjects,
maCheckExportBackgroundObjects.IsChecked() );
+maConfigItem.WriteBool( ExportSlideContents,
maCheckExportSlideContents.IsChecked() );
+maConfigItem.WriteBool( ExportSound, maCheckExportSound.IsChecked() );
+maConfigItem.WriteBool( ExportOLEAsJPEG,
maCheckExportOLEAsJPEG.IsChecked() );
+maConfigItem.WriteBool( ExportMultipleFiles,
maCheckExportMultipleFiles.IsChecked() );
Sequence PropertyValue aRet( maConfigItem.GetFilterData() );
diff --git a/filter/source/graphicfilter/epbm/epbm.cxx
b/filter/source/graphicfilter/epbm/epbm.cxx
index 3f867bd..a4efe85 100644
--- a/filter/source/graphicfilter/epbm/epbm.cxx
+++ b/filter/source/graphicfilter/epbm/epbm.cxx
@@ -74,7 +74,7 @@ sal_Bool PBMWriter::WritePBM( const Graphic rGraphic,
FilterConfigItem* pFilter
{
if ( pFilterConfigItem )
{
-mnMode = pFilterConfigItem-ReadInt32( String(
RTL_CONSTASCII_USTRINGPARAM( FileFormat ) ), 0 );
+mnMode = pFilterConfigItem-ReadInt32( FileFormat, 0 );
[Libreoffice-commits] core.git: sw/uiconfig
sw/uiconfig/swriter/ui/exchangedatabases.ui |4 - sw/uiconfig/swriter/ui/insertbookmark.ui| 15 +++ sw/uiconfig/swriter/ui/linenumbering.ui | 59 +++- sw/uiconfig/swriter/ui/rowheight.ui |4 - sw/uiconfig/swriter/ui/wordcount.ui | 12 ++--- 5 files changed, 49 insertions(+), 45 deletions(-) New commits: commit c133c2e8b6ed97026e183e940b112b3bbbf53dfa Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 21 00:04:52 2013 + various efforts to consistently apply HIG rules Change-Id: I75fc6a0e4edb77bf236110165049c33bbeb05ed5 diff --git a/sw/uiconfig/swriter/ui/exchangedatabases.ui b/sw/uiconfig/swriter/ui/exchangedatabases.ui index b76a920..08d75ff 100644 --- a/sw/uiconfig/swriter/ui/exchangedatabases.ui +++ b/sw/uiconfig/swriter/ui/exchangedatabases.ui @@ -3,13 +3,13 @@ !-- interface-requires gtk+ 3.0 -- object class=GtkDialog id=ExchangeDatabasesDialog property name=can_focusFalse/property -property name=border_width5/property +property name=border_width6/property property name=title translatable=yesExchange Databases/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 property name=can_focusFalse/property -property name=spacing2/property +property name=spacing12/property child internal-child=action_area object class=GtkButtonBox id=dialog-action_area1 property name=can_focusFalse/property diff --git a/sw/uiconfig/swriter/ui/insertbookmark.ui b/sw/uiconfig/swriter/ui/insertbookmark.ui index 86793d5..66639ab 100644 --- a/sw/uiconfig/swriter/ui/insertbookmark.ui +++ b/sw/uiconfig/swriter/ui/insertbookmark.ui @@ -3,13 +3,13 @@ !-- interface-requires gtk+ 3.0 -- object class=GtkDialog id=InsertBookmarkDialog property name=can_focusFalse/property -property name=border_width5/property +property name=border_width6/property property name=title translatable=yesInsert Bookmark/property property name=type_hintdialog/property child internal-child=vbox object class=GtkBox id=dialog-vbox1 property name=can_focusFalse/property -property name=spacing2/property +property name=spacing12/property child internal-child=action_area object class=GtkButtonBox id=dialog-action_area1 property name=can_focusFalse/property @@ -18,13 +18,11 @@ child object class=GtkButton id=ok property name=labelgtk-ok/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=can_defaultTrue/property property name=has_defaultTrue/property property name=receives_defaultTrue/property -property name=use_action_appearanceFalse/property property name=use_stockTrue/property /object packing @@ -36,11 +34,9 @@ child object class=GtkButton id=cancel property name=labelgtk-cancel/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property -property name=use_action_appearanceFalse/property property name=use_stockTrue/property /object packing @@ -52,11 +48,9 @@ child object class=GtkButton id=delete property name=label translatable=yesDelete/property -property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultTrue/property -property name=use_action_appearanceFalse/property /object packing property name=expandFalse/property @@ -79,6 +73,11 @@ property name=visibleTrue/property property name=can_focusTrue/property /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing /child /object /child diff --git a/sw/uiconfig/swriter/ui/linenumbering.ui b/sw/uiconfig/swriter/ui/linenumbering.ui index b7559e4..865943a 100644 --- a/sw/uiconfig/swriter/ui/linenumbering.ui +++ b/sw/uiconfig/swriter/ui/linenumbering.ui @@ -3,14 +3,14 @@ !-- interface-requires gtk+ 3.0 -- object class=GtkDialog id=LineNumberingDialog property name=can_focusFalse/property -property name=border_width5/property +
[Libreoffice-commits] core.git: cui/uiconfig
cui/uiconfig/ui/optuserpage.ui |5 - 1 file changed, 4 insertions(+), 1 deletion(-) New commits: commit 7c4dcdc43712ed494dcbd2aa6971ce22069e1fdf Author: Caolán McNamara caol...@redhat.com Date: Thu Feb 21 00:11:44 2013 + mnemonic got messed up on cut and paste Change-Id: I7b9459c685c73c79b9dcf0213fbe33b2d45976b7 diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui index b53421d..b544059 100644 --- a/cui/uiconfig/ui/optuserpage.ui +++ b/cui/uiconfig/ui/optuserpage.ui @@ -26,6 +26,7 @@ property name=xalign0/property property name=label translatable=yes_Company/property property name=use_underlineTrue/property +property name=mnemonic_widgetcompany/property /object packing property name=left_attach0/property @@ -57,6 +58,7 @@ property name=xalign0/property property name=label translatable=yes_Street/property property name=use_underlineTrue/property +property name=mnemonic_widgetstreet/property /object packing property name=left_attach0/property @@ -88,6 +90,7 @@ property name=xalign0/property property name=label translatable=yesCountry/Re_gion/property property name=use_underlineTrue/property +property name=mnemonic_widgetcountry/property /object packing property name=left_attach0/property @@ -734,7 +737,7 @@ property name=xalign0/property property name=label translatable=yes_Zip/City/property property name=use_underlineTrue/property -property name=mnemonic_widgetcity/property +property name=mnemonic_widgetizip/property /object packing property name=left_attach0/property ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - canvas/source svtools/inc svtools/source
canvas/source/directx/dx_canvas.cxx |2 +-
svtools/inc/svtools/calendar.hxx|6 +++---
svtools/source/control/calendar.cxx | 13 -
3 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit 0a967d4cb4468785ed3d302104642353b93232f2
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 21 00:28:14 2013 +
fix win build
Change-Id: I42506c15f62329fb2f5733f0c34e4bb1b4d27f13
diff --git a/canvas/source/directx/dx_canvas.cxx
b/canvas/source/directx/dx_canvas.cxx
index 602224b..5a256e9 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.cxx
@@ -96,7 +96,7 @@ namespace dxcanvas
const SystemGraphicsData* pSysData=reinterpret_castconst
SystemGraphicsData*(aSeq.getConstArray());
if( !pSysData || !pSysData-hDC )
-throw lang::NoSupportException( Passed SystemGraphicsData or HDC
invalid! ), NULL);
+throw lang::NoSupportException(Passed SystemGraphicsData or HDC
invalid!, NULL);
// setup helper
maDeviceHelper.init( pSysData-hDC,
commit 09e93552bef88d0842621a7c2e48684a10075df1
Author: Caolán McNamara caol...@redhat.com
Date: Thu Feb 21 00:24:19 2013 +
XubString-OUString
Change-Id: Ie110963f0b54bd2235d088a886db3f16e397bd86
diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx
index 778f374..2c41ae7 100644
--- a/svtools/inc/svtools/calendar.hxx
+++ b/svtools/inc/svtools/calendar.hxx
@@ -162,9 +162,9 @@ private:
IntDateSet* mpSelectTable;
IntDateSet* mpOldSelectTable;
IntDateSet* mpRestoreSelectTable;
-XubString* mpDayText[31];
-XubString maDayText;
-XubString maWeekText;
+OUStringmaDayTexts[31];
+OUStringmaDayText;
+OUStringmaWeekText;
CalendarWrapper maCalendarWrapper;
Rectangle maPrevRect;
Rectangle maNextRect;
diff --git a/svtools/source/control/calendar.cxx
b/svtools/source/control/calendar.cxx
index 83955ae..529029e 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -218,7 +218,7 @@ void Calendar::ImplInit( WinBits nWinStyle )
// Tagestexte anlegen
for (sal_Int32 i = 0; i 31; ++i)
-mpDayText[i] = new String(OUString::valueOf(i+1));
+maDayTexts[i] = OUString::valueOf(i+1);
maDragScrollTimer.SetTimeoutHdl( STATIC_LINK( this, Calendar, ScrollHdl )
);
maDragScrollTimer.SetTimeout(
GetSettings().GetMouseSettings().GetScrollRepeat() );
@@ -264,13 +264,8 @@ Calendar::~Calendar()
delete mpSundayColor;
delete mpSelectTable;
-if ( mpOldSelectTable )
-delete mpOldSelectTable;
-if ( mpRestoreSelectTable )
-delete mpRestoreSelectTable;
-
-for ( sal_uInt16 i = 0; i 31; i++ )
-delete mpDayText[i];
+delete mpOldSelectTable;
+delete mpRestoreSelectTable;
}
// ---
@@ -715,7 +710,7 @@ void Calendar::ImplDrawDate( long nX, long nY,
sal_Bool bBack, sal_Bool bOther, sal_uLong nToday
)
{
Color* pTextColor = NULL;
-const String rDay = *(mpDayText[nDay-1]);
+const OUString rDay = maDayTexts[nDay-1];
Rectangle aDateRect( nX, nY, nX+mnDayWidth-1, nY+mnDayHeight-1 );
sal_Bool bSel = sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - solenv/inc
solenv/inc/lldb4aoo.py | 78 +
1 file changed, 78 insertions(+)
New commits:
commit 76d674c4aea0a40a3c46453e653055859a6a7ba9
Author: Herbert Dürr h...@apache.org
Date: Wed Feb 20 15:35:52 2013 +
lldb4aoo: consolidate AOO string data/object/nullptr handling
diff --git a/solenv/inc/lldb4aoo.py b/solenv/inc/lldb4aoo.py
index 2319c16..6172207 100644
--- a/solenv/inc/lldb4aoo.py
+++ b/solenv/inc/lldb4aoo.py
@@ -1,5 +1,5 @@
-# to activate run the command below when inside lldb
-# command script import /tools/lldb4aoo.py
+# to activate LLDB helper script run the command below when inside LLDB
+# command script import /tools/lldb4aoo.py
# or add the line to ~/.lldbinit to always activate it
def __lldb_init_module( dbg, dict):
@@ -26,60 +26,53 @@ def __lldb_init_module( dbg, dict):
# definitions for individual LLDB type summary helpers
-def ret_strinfo( refs, length, ary0):
- a = ary0.AddressOf().GetPointeeData( 0, length)
- if ary0.GetByteSize() == 1:
- s = ''.join([chr(x) for x in a.uint8s])
+def ret_strdata_info( v, refvar, lenvar, aryvar):
+ while v.TypeIsPointerType():
+ if v.GetValueAsUnsigned() == 0:
+ return 'NULL-Pointer!'
+ v = v.Dereference()
+ r = v.GetChildMemberWithName( refvar).GetValueAsSigned()
+ l = v.GetChildMemberWithName( lenvar).GetValueAsSigned()
+ c = v.GetChildMemberWithName( aryvar)
+ d = c.AddressOf().GetPointeeData( 0, l)
+ if c.GetByteSize() == 1: # assume UTF-8
+ s = ''.join([chr(x) for x in d.uint8s])
else: # assume UTF-16
- s = (u''.join([unichr(x) for x in a.uint16s])).encode('utf-8')
- return ('{refs=%d, len=%d, str=%s}' % (refs, length,
s.encode('string_escape')))
+ s = (u''.join([unichr(x) for x in d.uint16s])).encode('utf-8')
+ info = ('{refs=%d, len=%d, str=%s}' % (r, l,
s.encode('string_escape')))
+ return info
+
+def ret_strobject_info( v, ptrvar):
+ while v.TypeIsPointerType():
+ if v.GetValueAsUnsigned() == 0:
+ return 'NULL-Pointer!'
+ v = v.Dereference()
+ p = v.GetChildMemberWithName( ptrvar)
+ return p.Dereference()
+
def getinfo_for_rtl_String( valobj, dict):
- while valobj.TypeIsPointerType():
- valobj = valobj.Dereference()
- r = valobj.GetChildMemberWithName('refCount').GetValueAsSigned()
- l = valobj.GetChildMemberWithName('length').GetValueAsSigned()
- a = valobj.GetChildMemberWithName('buffer')
- return ret_strinfo(r,l,a)
+ return ret_strdata_info( valobj, 'refCount', 'length', 'buffer')
def getinfo_for_rtl_uString( valobj, dict):
- while valobj.TypeIsPointerType():
- valobj = valobj.Dereference()
- r = valobj.GetChildMemberWithName('refCount').GetValueAsSigned()
- l = valobj.GetChildMemberWithName('length').GetValueAsSigned()
- a = valobj.GetChildMemberWithName('buffer')
- return ret_strinfo(r,l,a)
+ return ret_strdata_info( valobj, 'refCount', 'length', 'buffer')
def getinfo_for__ByteStringData( valobj, dict):
- while valobj.TypeIsPointerType():
- valobj = valobj.Dereference()
- r = valobj.GetChildMemberWithName('mnRefCount').GetValueAsSigned()
- l = valobj.GetChildMemberWithName('mnLen').GetValueAsSigned()
- a = valobj.GetChildMemberWithName('maStr')
- return ret_strinfo(r,l,a)
+ return ret_strdata_info( valobj, 'mnRefCount', 'mnLen', 'maStr')
def getinfo_for__UniStringData( valobj, dict):
- while valobj.TypeIsPointerType():
- valobj = valobj.Dereference()
- r = valobj.GetChildMemberWithName('mnRefCount').GetValueAsSigned()
- l = valobj.GetChildMemberWithName('mnLen').GetValueAsSigned()
- a = valobj.GetChildMemberWithName('maStr')
- return ret_strinfo(r,l,a)
+ return ret_strdata_info( valobj, 'mnRefCount', 'mnLen', 'maStr')
def getinfo_for_rtl_OString( valobj, dict):
- d = valobj.GetChildMemberWithName('pData')
- return d.Dereference()
+ return ret_strobject_info( valobj, 'pData')
def getinfo_for_rtl_OUString( valobj, dict):
- d = valobj.GetChildMemberWithName('pData')
- return d.Dereference()
+ return ret_strobject_jinfo( valobj, 'pData')
def getinfo_for_ByteString( valobj, dict):
- d = valobj.GetChildMemberWithName('mpData')
- return d.Dereference()
+ return ret_strobject_jinfo( valobj, 'mpData')
def getinfo_for_UniString( valobj, dict):
- d = valobj.GetChildMemberWithName('mpData')
- return d.Dereference()
+ return ret_strobject_info( valobj, 'mpData')
commit 7af1212f664f46af44e97316d549641de9a31522
Author: Herbert Dürr h...@apache.org
Date: Wed Feb 20 14:53:37 2013 +
consolidate presentation of AOO-strings in LLDB
diff
[Libreoffice-commits] core.git: sc/source
sc/source/filter/inc/worksheethelper.hxx |2 ++
sc/source/filter/oox/workbookfragment.cxx | 13 +
sc/source/filter/oox/worksheethelper.cxx | 14 --
3 files changed, 27 insertions(+), 2 deletions(-)
New commits:
commit 7c351c32ea9b34f7b798c2487854753bb4693110
Author: Markus Mohrhard markus.mohrh...@googlemail.com
Date: Thu Feb 21 02:23:13 2013 +0100
delay importing all drawing elements until content is loaded, fdo#60488
Otherwise charts with data ranges on other sheets will not be painted
correctly as the data is missing when the chart is rendered for the
first time. This was not a problem before the cached value import
because the hard recalc would have forced a repaint anyway.
The new way should also be a bit quicker.
Change-Id: I6a010a4dffad6ebe2264b8312f93b16d9c87
diff --git a/sc/source/filter/inc/worksheethelper.hxx
b/sc/source/filter/inc/worksheethelper.hxx
index 32db180..2efa6e4 100644
--- a/sc/source/filter/inc/worksheethelper.hxx
+++ b/sc/source/filter/inc/worksheethelper.hxx
@@ -303,6 +303,8 @@ public:
voidinitializeWorksheetImport();
/** Final conversion after importing the worksheet. */
voidfinalizeWorksheetImport();
+/** Final import of drawing objects. Has to be called after all content
has been imported */
+void finalizeDrawingImport();
voidsetCellFormula( const
::com::sun::star::table::CellAddress rTokenAddress, const rtl::OUString );
voidsetCellFormula( const
::com::sun::star::table::CellAddress rTokenAddress, sal_Int32 );
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index ba0c2fd..41a6ce7 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -231,6 +231,7 @@ void WorkbookFragment::finalizeImport()
typedef ::std::pair WorksheetGlobalsRef, FragmentHandlerRef
SheetFragmentHandler;
typedef ::std::vector SheetFragmentHandler SheetFragmentVector;
SheetFragmentVector aSheetFragments;
+std::vectorWorksheetHelper* maHelpers;
WorksheetBuffer rWorksheets = getWorksheets();
sal_Int32 nWorksheetCount = rWorksheets.getWorksheetCount();
for( sal_Int32 nWorksheet = 0; nWorksheet nWorksheetCount; ++nWorksheet )
@@ -286,7 +287,10 @@ void WorkbookFragment::finalizeImport()
// insert the fragment into the map
if( xFragment.is() )
+{
aSheetFragments.push_back( SheetFragmentHandler(
xSheetGlob, xFragment.get() ) );
+maHelpers.push_back(xFragment.get());
+}
}
}
}
@@ -301,6 +305,15 @@ void WorkbookFragment::finalizeImport()
{
// import the sheet fragment
importOoxFragment( aIt-second );
+}
+
+for( std::vectorWorksheetHelper*::iterator aIt = maHelpers.begin(), aEnd
= maHelpers.end(); aIt != aEnd; ++aIt )
+{
+(*aIt)-finalizeDrawingImport();
+}
+
+for( SheetFragmentVector::iterator aIt = aSheetFragments.begin(), aEnd =
aSheetFragments.end(); aIt != aEnd; ++aIt )
+{
// delete fragment object and WorkbookGlobals object, will free all
allocated sheet buffers
aIt-second.clear();
aIt-first.reset();
diff --git a/sc/source/filter/oox/worksheethelper.cxx
b/sc/source/filter/oox/worksheethelper.cxx
index fe072cb..c56b478 100644
--- a/sc/source/filter/oox/worksheethelper.cxx
+++ b/sc/source/filter/oox/worksheethelper.cxx
@@ -343,6 +343,8 @@ public:
/** Final conversion after importing the worksheet. */
voidfinalizeWorksheetImport();
+void finalizeDrawingImport();
+
private:
typedef ::std::vector sal_Int32 OutlineLevelVec;
typedef ::std::pair ColumnModel, sal_Int32ColumnModelRange;
@@ -957,9 +959,12 @@ void WorksheetGlobals::finalizeWorksheetImport()
lclUpdateProgressBar( mxFinalProgress, 0.5 );
convertColumns();
convertRows();
-lclUpdateProgressBar( mxFinalProgress, 0.75 );
-finalizeDrawings();
lclUpdateProgressBar( mxFinalProgress, 1.0 );
+}
+
+void WorksheetGlobals::finalizeDrawingImport()
+{
+finalizeDrawings();
// forget current sheet index in global data
setCurrentSheetIndex( -1 );
@@ -1580,6 +1585,11 @@ void WorksheetHelper::finalizeWorksheetImport()
mrSheetGlob.finalizeWorksheetImport();
}
+void WorksheetHelper::finalizeDrawingImport()
+{
+mrSheetGlob.finalizeDrawingImport();
+}
+
void WorksheetHelper::setCellFormula( const
::com::sun::star::table::CellAddress rTokenAddress, const rtl::OUString
rTokenStr )
{
getFormulaBuffer().setCellFormula( rTokenAddress, rTokenStr );
___
Libreoffice-commits mailing list
[PATCH] convert odk to gbuild and add to tail_build
Hello LibreOffice gerrit bot, David Ostrovsky, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2288 to look at the new patch set (#4). Change subject: convert odk to gbuild and add to tail_build .. convert odk to gbuild and add to tail_build Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 --- M Module_tail_build.mk M Repository.mk M RepositoryModule_ooo.mk A odk/CustomTarget_autodoc.mk A odk/CustomTarget_bin.mk A odk/CustomTarget_check.mk A odk/CustomTarget_classes.mk A odk/CustomTarget_cli.mk A odk/CustomTarget_doxygen.mk A odk/CustomTarget_idl.mk A odk/CustomTarget_include.mk A odk/CustomTarget_javadoc.mk A odk/CustomTarget_lib.mk A odk/CustomTarget_odkcommon.mk A odk/CustomTarget_settings.mk A odk/CustomTarget_unowinreg.mk A odk/Executable_unoapploader.mk A odk/Library_unowinreg.mk A odk/Makefile A odk/Module_odk.mk A odk/Zip_odkcommon.mk A odk/Zip_odkexamples.mk A odk/Zip_uno_loader_classes.mk R odk/config/cfgWin.js R odk/config/configure.pl R odk/config/setsdkenv_unix R odk/config/setsdkenv_unix.csh.in R odk/config/setsdkenv_unix.sh.in R odk/config/setsdkenv_windows.bat R odk/config/setsdkenv_windows.template R odk/config/setsdkname.bat D odk/inc/makefile.mk D odk/pack/checkbin/makefile.mk D odk/pack/checkidl/makefile.mk D odk/pack/checkinc/makefile.mk D odk/pack/checkinc2/makefile.mk D odk/pack/copying/makefile.mk D odk/pack/gendocu/makefile.mk D odk/pack/unzip_udk/deltree.txt D odk/pack/unzip_udk/makefile.mk M odk/prj/build.lst M odk/prj/d.lst D odk/prj/dmake D odk/source/com/sun/star/lib/loader/makefile.mk D odk/source/unoapploader/unx/makefile.mk D odk/source/unoapploader/win/makefile.mk D odk/source/unowinreg/win/makefile.mk D odk/source/unowinreg/win/unowinreg.dxp D odk/util/delzip D odk/util/makefile.mk D odk/util/makefile.pmk D odk/util/odk_rules.pmk M postprocess/prj/build.lst M solenv/gbuild/Zip.mk 54 files changed, 968 insertions(+), 1,468 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2288/4 -- To view, visit https://gerrit.libreoffice.org/2288 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 Gerrit-PatchSet: 4 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
problem with assert statement in ustring.hxx
Hey, I'm currently running the calc files throough the automatic import test and the first XLSX file that crashed was novell#349591. THe problem there is the assert statement in ustring.hxx:232 together with the vmldrawing.cxx:59. Is it correct that we can't handle \0 in a string literal or is the assert statement wrong? Regards, Markus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: problem with assert statement in ustring.hxx
On Wed, Feb 20, 2013 at 9:48 PM, Markus Mohrhard
markus.mohrh...@googlemail.com wrote:
Hey,
I'm currently running the calc files throough the automatic import
test and the first XLSX file that crashed was novell#349591.
THe problem there is the assert statement in ustring.hxx:232 together
with the vmldrawing.cxx:59.
Is it correct that we can't handle \0 in a string literal or is the
assert statement wrong?
maybe
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 5293e1e..371d1320 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -55,8 +55,9 @@ namespace {
/** Returns the textual representation of a numeric VML shape identifier. */
OUString lclGetShapeId( sal_Int32 nShapeId )
{
+sal_Unicode prefix[2] = {0,115}; /* \0s */
// identifier consists of a literal NUL character, a lowercase
's', and the id
-return OUString( \0s ) + OUString::valueOf( nShapeId );
+return OUString( prefix, 2 ) + OUString::valueOf( nShapeId );
}
/** Returns the numeric VML shape identifier from its textual
representation. */
Norbert
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] quiet external module build log unless failure
Norbert Thiebaud has created a new patch set by issuing a rebase in Gerrit (#2). Change subject: quiet external module build log unless failure .. quiet external module build log unless failure ExternalProject usually involve a configure and a make step that produce a bunch of output usually irrelevant including a large number of warning and other mess. now that everything is pretty much in tail_build these output get interleaved with useful output from the build of the product and actually drown them in a logorrhea of messy noise. This add the configure option --enable-quiet-external that store the output of external modules in a log file and only print them as a whole if the module failed do build. Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647 --- M apache-commons/ExternalProject_apache_commons_codec.mk M apache-commons/ExternalProject_apache_commons_httpclient.mk M apache-commons/ExternalProject_apache_commons_lang.mk M apache-commons/ExternalProject_apache_commons_logging.mk M beanshell/ExternalProject_beanshell.mk M cairo/ExternalProject_cairo.mk M cairo/ExternalProject_pixman.mk M config_host.mk.in M configure.ac M cppunit/ExternalProject_cppunit.mk M curl/ExternalProject_curl.mk M expat/ExternalProject_expat.mk M fontconfig/ExternalProject_fontconfig.mk M hsqldb/ExternalProject_hsqldb.mk M hunspell/ExternalProject_hunspell.mk M hyphen/ExternalProject_hyphen.mk M icu/ExternalProject_icu.mk M jfreereport/ExternalProject_jfreereport_flow_engine.mk M jfreereport/ExternalProject_jfreereport_flute.mk M jfreereport/ExternalProject_jfreereport_libbase.mk M jfreereport/ExternalProject_jfreereport_libfonts.mk M jfreereport/ExternalProject_jfreereport_libformula.mk M jfreereport/ExternalProject_jfreereport_liblayout.mk M jfreereport/ExternalProject_jfreereport_libloader.mk M jfreereport/ExternalProject_jfreereport_librepository.mk M jfreereport/ExternalProject_jfreereport_libserializer.mk M jfreereport/ExternalProject_jfreereport_libxml.mk M jfreereport/ExternalProject_jfreereport_sac.mk M lcms2/ExternalProject_lcms2.mk M libcdr/ExternalProject_libcdr.mk M libexttextcat/ExternalProject_exttextcat.mk M liblangtag/ExternalProject_langtag.mk M libmspub/ExternalProject_libmspub.mk M liborcus/ExternalProject_liborcus.mk M libvisio/ExternalProject_libvisio.mk M libwpd/ExternalProject_libwpd.mk M libxml2/ExternalProject_xml2.mk M libxmlsec/ExternalProject_xmlsec.mk M libxslt/ExternalProject_xslt.mk M lpsolve/ExternalProject_lpsolve.mk M mythes/ExternalProject_mythes.mk M nss/ExternalProject_nss.mk M openldap/ExternalProject_openldap.mk M openssl/ExternalProject_openssl.mk M postgresql/ExternalProject_postgresql.mk M python3/ExternalProject_python3.mk M pyuno/CustomTarget_zipcore.mk M redland/ExternalProject_raptor.mk M redland/ExternalProject_rasqal.mk M redland/ExternalProject_redland.mk M rhino/ExternalProject_rhino.mk M solenv/gbuild/Helper.mk M solenv/gbuild/Zip.mk M solenv/gbuild/gbuild.mk M tomcat/ExternalProject_tomcat.mk M xpdf/ExternalProject_xpdf.mk 56 files changed, 231 insertions(+), 195 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/2304/2 -- To view, visit https://gerrit.libreoffice.org/2304 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I3abfcccd6d16821a9e061a71e031b427cc283647 Gerrit-PatchSet: 2 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Norbert Thiebaud nthieb...@gmail.com Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] convert odk to gbuild and add to tail_build
Hello LibreOffice gerrit bot, David Ostrovsky, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2288 to look at the new patch set (#5). Change subject: convert odk to gbuild and add to tail_build .. convert odk to gbuild and add to tail_build Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 --- M Module_tail_build.mk M Repository.mk M RepositoryModule_ooo.mk A odk/CustomTarget_autodoc.mk A odk/CustomTarget_bin.mk A odk/CustomTarget_check.mk A odk/CustomTarget_classes.mk A odk/CustomTarget_cli.mk A odk/CustomTarget_doxygen.mk A odk/CustomTarget_idl.mk A odk/CustomTarget_include.mk A odk/CustomTarget_javadoc.mk A odk/CustomTarget_lib.mk A odk/CustomTarget_odkcommon.mk A odk/CustomTarget_settings.mk A odk/CustomTarget_unowinreg.mk A odk/Executable_unoapploader.mk A odk/Library_unowinreg.mk A odk/Makefile A odk/Module_odk.mk A odk/Zip_odkcommon.mk A odk/Zip_odkexamples.mk A odk/Zip_uno_loader_classes.mk R odk/config/cfgWin.js R odk/config/configure.pl R odk/config/setsdkenv_unix R odk/config/setsdkenv_unix.csh.in R odk/config/setsdkenv_unix.sh.in R odk/config/setsdkenv_windows.bat R odk/config/setsdkenv_windows.template R odk/config/setsdkname.bat D odk/inc/makefile.mk D odk/pack/checkbin/makefile.mk D odk/pack/checkidl/makefile.mk D odk/pack/checkinc/makefile.mk D odk/pack/checkinc2/makefile.mk D odk/pack/copying/makefile.mk D odk/pack/gendocu/makefile.mk D odk/pack/unzip_udk/deltree.txt D odk/pack/unzip_udk/makefile.mk M odk/prj/build.lst M odk/prj/d.lst D odk/prj/dmake D odk/source/com/sun/star/lib/loader/makefile.mk D odk/source/unoapploader/unx/makefile.mk D odk/source/unoapploader/win/makefile.mk D odk/source/unowinreg/win/makefile.mk D odk/source/unowinreg/win/unowinreg.dxp D odk/util/delzip D odk/util/makefile.mk D odk/util/makefile.pmk D odk/util/odk_rules.pmk M postprocess/prj/build.lst M solenv/gbuild/Zip.mk 54 files changed, 968 insertions(+), 1,468 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2288/5 -- To view, visit https://gerrit.libreoffice.org/2288 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 Gerrit-PatchSet: 5 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[PATCH] convert odk to gbuild and add to tail_build
Hello LibreOffice gerrit bot, David Ostrovsky, I'd like you to reexamine a change. Please visit https://gerrit.libreoffice.org/2288 to look at the new patch set (#6). Change subject: convert odk to gbuild and add to tail_build .. convert odk to gbuild and add to tail_build Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 --- M Module_tail_build.mk M Repository.mk M RepositoryModule_ooo.mk A odk/CustomTarget_autodoc.mk A odk/CustomTarget_bin.mk A odk/CustomTarget_check.mk A odk/CustomTarget_classes.mk A odk/CustomTarget_cli.mk A odk/CustomTarget_doxygen.mk A odk/CustomTarget_idl.mk A odk/CustomTarget_include.mk A odk/CustomTarget_javadoc.mk A odk/CustomTarget_lib.mk A odk/CustomTarget_odkcommon.mk A odk/CustomTarget_settings.mk A odk/CustomTarget_unowinreg.mk A odk/Executable_unoapploader.mk A odk/Library_unowinreg.mk A odk/Makefile A odk/Module_odk.mk A odk/Zip_odkcommon.mk A odk/Zip_odkexamples.mk A odk/Zip_uno_loader_classes.mk R odk/config/cfgWin.js R odk/config/configure.pl R odk/config/setsdkenv_unix R odk/config/setsdkenv_unix.csh.in R odk/config/setsdkenv_unix.sh.in R odk/config/setsdkenv_windows.bat R odk/config/setsdkenv_windows.template R odk/config/setsdkname.bat D odk/inc/makefile.mk D odk/pack/checkbin/makefile.mk D odk/pack/checkidl/makefile.mk D odk/pack/checkinc/makefile.mk D odk/pack/checkinc2/makefile.mk D odk/pack/copying/makefile.mk D odk/pack/gendocu/makefile.mk D odk/pack/unzip_udk/deltree.txt D odk/pack/unzip_udk/makefile.mk M odk/prj/build.lst M odk/prj/d.lst D odk/prj/dmake D odk/source/com/sun/star/lib/loader/makefile.mk D odk/source/unoapploader/unx/makefile.mk D odk/source/unoapploader/win/makefile.mk D odk/source/unowinreg/win/makefile.mk D odk/source/unowinreg/win/unowinreg.dxp D odk/util/delzip D odk/util/makefile.mk D odk/util/makefile.pmk D odk/util/odk_rules.pmk M postprocess/prj/build.lst M solenv/gbuild/Zip.mk 54 files changed, 968 insertions(+), 1,468 deletions(-) git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/2288/6 -- To view, visit https://gerrit.libreoffice.org/2288 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8e8de7f2bb87cce7916c7c2df24c1b0ddaea55c0 Gerrit-PatchSet: 6 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Peter Foley pefol...@verizon.net Gerrit-Reviewer: David Ostrovsky david.ostrov...@gmx.de Gerrit-Reviewer: LibreOffice gerrit bot ger...@libreoffice.org Gerrit-Reviewer: Norbert Thiebaud nthieb...@gmail.com ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: filter/source
filter/source/config/fragments/types/calc_ODS_FlatXML.xcu|2 +- filter/source/config/fragments/types/draw_ODG_FlatXML.xcu|2 +- filter/source/config/fragments/types/impress_ODP_FlatXML.xcu |2 +- filter/source/config/fragments/types/writer_ODT_FlatXML.xcu |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) New commits: commit a3a93ad2987bb702ed643f190b7f55ef9ebd8880 Author: Andras Timar ati...@suse.com Date: Thu Feb 21 08:25:30 2013 +0100 unlocalisable filter UINames Change-Id: I6785329d718ef9a1196867d8fd7c318ec336b10c diff --git a/filter/source/config/fragments/types/calc_ODS_FlatXML.xcu b/filter/source/config/fragments/types/calc_ODS_FlatXML.xcu index 0e77862..22064e7 100644 --- a/filter/source/config/fragments/types/calc_ODS_FlatXML.xcu +++ b/filter/source/config/fragments/types/calc_ODS_FlatXML.xcu @@ -23,7 +23,7 @@ prop oor:name=Preferredvaluefalse/value/prop prop oor:name=PreferredFiltervalueOpenDocument Spreadsheet Flat XML/value/prop prop oor:name=UIName -valueOpenDocument Spreadsheet (Flat XML)/value +value xml:lang=en-USOpenDocument Spreadsheet (Flat XML)/value /prop prop oor:name=ClipboardFormat valuedoctype:office:mimetype=application/vnd.oasis.opendocument.spreadsheet/value diff --git a/filter/source/config/fragments/types/draw_ODG_FlatXML.xcu b/filter/source/config/fragments/types/draw_ODG_FlatXML.xcu index 69234ce..e8272cd 100644 --- a/filter/source/config/fragments/types/draw_ODG_FlatXML.xcu +++ b/filter/source/config/fragments/types/draw_ODG_FlatXML.xcu @@ -23,7 +23,7 @@ prop oor:name=Preferredvaluefalse/value/prop prop oor:name=PreferredFiltervalueOpenDocument Drawing Flat XML/value/prop prop oor:name=UIName -valueOpenDocument Drawing (Flat XML)/value +value xml:lang=en-USOpenDocument Drawing (Flat XML)/value /prop prop oor:name=ClipboardFormat valuedoctype:office:mimetype=application/vnd.oasis.opendocument.graphics/value diff --git a/filter/source/config/fragments/types/impress_ODP_FlatXML.xcu b/filter/source/config/fragments/types/impress_ODP_FlatXML.xcu index 7157d48..6e9792f 100644 --- a/filter/source/config/fragments/types/impress_ODP_FlatXML.xcu +++ b/filter/source/config/fragments/types/impress_ODP_FlatXML.xcu @@ -23,7 +23,7 @@ prop oor:name=Preferredvaluefalse/value/prop prop oor:name=PreferredFiltervalueOpenDocument Presentation Flat XML/value/prop prop oor:name=UIName -valueOpenDocument Presentation (Flat XML)/value +value xml:lang=en-USOpenDocument Presentation (Flat XML)/value /prop prop oor:name=ClipboardFormat valuedoctype:office:mimetype=application/vnd.oasis.opendocument.presentation/value diff --git a/filter/source/config/fragments/types/writer_ODT_FlatXML.xcu b/filter/source/config/fragments/types/writer_ODT_FlatXML.xcu index b1b789b..fc17056 100644 --- a/filter/source/config/fragments/types/writer_ODT_FlatXML.xcu +++ b/filter/source/config/fragments/types/writer_ODT_FlatXML.xcu @@ -23,7 +23,7 @@ prop oor:name=Preferredvaluefalse/value/prop prop oor:name=PreferredFiltervalueOpenDocument Text Flat XML/value/prop prop oor:name=UIName -valueOpenDocument Text (Flat XML)/value +value xml:lang=en-USOpenDocument Text (Flat XML)/value /prop prop oor:name=ClipboardFormat valuedoctype:office:mimetype=application/vnd.oasis.opendocument.text/value ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: icu/Module_icu.mk icu/UnpackedTarball_icu_data.mk icu/UnpackedTarball_icu.mk
icu/Module_icu.mk |1 - icu/UnpackedTarball_icu.mk |6 -- icu/UnpackedTarball_icu_data.mk | 22 -- 3 files changed, 29 deletions(-) New commits: commit 2939a57e11a5dc8cadecdc5fae46ee17172ce110 Author: Fridrich Å trba fridrich.st...@bluewin.ch Date: Thu Feb 21 08:27:18 2013 +0100 Don't cripple the icu data CorelDraw and MS Publisher importers use icu for conversions between 8-bit character sets and UTF8. In some cases even between UTF16 and UTF8. Thus we need the relevant data. Use the default icu-provided data for the while. Change-Id: I7914bf8a792cf72b34335a0a423b2304b30a26b4 diff --git a/icu/Module_icu.mk b/icu/Module_icu.mk index 524147b..46e02d3 100644 --- a/icu/Module_icu.mk +++ b/icu/Module_icu.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,icu)) ifeq ($(SYSTEM_ICU),NO) $(eval $(call gb_Module_add_targets,icu,\ UnpackedTarball_icu \ - UnpackedTarball_icu_data \ ExternalPackage_icu \ ExternalProject_icu \ )) diff --git a/icu/UnpackedTarball_icu.mk b/icu/UnpackedTarball_icu.mk index 329c1af..e1ace9c 100644 --- a/icu/UnpackedTarball_icu.mk +++ b/icu/UnpackedTarball_icu.mk @@ -11,12 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu)) $(eval $(call gb_UnpackedTarball_set_tarball,icu,$(ICU_TARBALL))) -$(call gb_UnpackedTarball_get_target,icu): $(call gb_UnpackedTarball_get_target,icu_data) -$(eval $(call gb_UnpackedTarball_set_post_action,icu,\ - cp $(call gb_UnpackedTarball_get_dir,icu_data)/icudt49l.dat \ - $(call gb_UnpackedTarball_get_dir,icu)/source/data/in/ \ -)) - $(eval $(call gb_UnpackedTarball_add_patches,icu,\ icu/icu4c.9948.mlym-crash.patch \ icu/icu4c-bsd.patch \ diff --git a/icu/UnpackedTarball_icu_data.mk b/icu/UnpackedTarball_icu_data.mk deleted file mode 100644 index 9b15ad9..000 --- a/icu/UnpackedTarball_icu_data.mk +++ /dev/null @@ -1,22 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,icu_data)) - -# Save space when using a bundled ICU by leaving out unneeded parts of the ICU data. Generated by -# the interactive web tool at http://apps.icu-project.org/datacustom/ICUData49.html by dropping -# the Charset Mapping Tables. Probably we could carefully cherry-pick other items in the data to -# be dropped, too. A bit tedious using that web tool, though. - -# If you do that, upload a new subset data zip file with just the MD5 part of the name changed -# appropriately. Let's not bother trying to list what stuff has been removed in the file name. -# Describe it in the comment above instead. -$(eval $(call gb_UnpackedTarball_set_tarball,icu_data,$(ICU_DATA_SUBSET_ZIP),0)) - -# vim: set noet sw=4 ts=4: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 54157] LibreOffice 3.7/4.0 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=54157 Winfried Donkers o...@dci-electronics.nl changed: What|Removed |Added Depends on||60922 --- Comment #113 from Winfried Donkers o...@dci-electronics.nl --- Saving a new document as docx results in corrupted file, whereas saving as docx from existing document does not. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] FDO BSA Administration Info - New version 3.6.5.2 release
Version 4.0.1.1 rc has been added to FreeDesktop.Org (FDO) as well as to Bug Submission Assistant (BSA) in response to previous announcement made by Petr. Any questions send them my way Best Regards, Joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] FDO BSA Administration Info - New version 4.0.1.1 rc
Forgot to edit subject, correction to previous email. My mistake Version 4.0.1.1 rc has been added to FreeDesktop.Org (FDO) as well as to Bug Submission Assistant (BSA) in response to previous announcement made by Petr. Any questions send them my way Best Regards, Joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] [LibreOffice-QA] Conference Call - February 22nd, 2013 - 1400 UTC
Our next conference call details are below, currently the agenda is quite full, if there is an urgent matter please add to list, otherwise let's just try to tackle this agenda :) Date: Friday, February 22nd, 2013 Time: 1400 UTC Duration: ~1 hour Current agenda Call In Instructions: http://wiki.** documentfoundation.org/QA_**Call_Current_Agendahttp://wiki.documentfoundation.org/QA_Call_Current_Agenda Open to everyone, feel free to call in and just listen or to share your thoughts on QA procedure. Best Regards, Joel -- *Joel Madero* LibreOffice QA Volunteer jmadero@gmail.com ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
Re: [Libreoffice-qa] Fw: Regression - LO Writer 4.0
I'm using LO version 4.0.1.1 (Build ID: 2c0c17a6e4bee0ee28131ea4bdc47edc700d659) since more than 3 hours on the same 262 pages long Writer document and the problem seems solved! LO 64 bits linux .deb version. Fluidity is back (like 3.6.x versions). I'll do the same check on win32 version when available. Raymond -- This post is identical as the one in the LibreOffice / Dev section. -- View this message in context: http://nabble.documentfoundation.org/Libreoffice-qa-Fw-Regression-LO-Writer-4-0-tp4038545p4038984.html Sent from the QA mailing list archive at Nabble.com. ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-qa] Bibisect Repository
Hey Bjoern Joren and everyone else, Not sure who else should be involved with this so I just sent out to QA list. We're a bit stumped as to what's going on with the bibisect repository. Has anyone gotten it to successfully work? I believe that earlier Joren said latest was failing for some reason or another. Right now I am downloading the 4.1 gig archive file but it's quite a bit out of date so it would be good to have the git repo up and running -- of course this hope is coming from someone who has 0 ability to help make that happen. Basically looking for: a) is it up and running? b) if not, who can we ping for updates? c) if so, how do we actually use it? One other thing that we noticed earlier was that the repo was about 2.1 gigs while the archive is 4+ gigs -- not sure why this would be the case. Any pointers appreciated, thanks all ! Best Regards, Joel ___ List Name: Libreoffice-qa mailing list Mail address: Libreoffice-qa@lists.freedesktop.org Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/ Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette List archive: http://lists.freedesktop.org/archives/libreoffice-qa/
[Libreoffice-bugs] [Bug 51311] FILESAVE: Writer takes a long time to begin saving large files
https://bugs.freedesktop.org/show_bug.cgi?id=51311 --- Comment #5 from Aibara cranberrydoug...@yahoo.com --- I still have the same issues described in bug #58040: when I open the file the progress bar fills, then the program hangs for a good 15 seconds. Editing text doesn't work immediately either (that takes another 10 seconds about to work properly). Perhaps the difference is due to my laptop. Though of course back in 3.4 series and earlier there was no problem at all. As for marking this minor or medium, it's up to you. It's an annoying regression, plus if the user thinks the program has hung they might just try to force quit it. But I'm not sure how that fits into minor/medium destinctions. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 57536] Wrong Chinese conversion: 著 着
https://bugs.freedesktop.org/show_bug.cgi?id=57536 --- Comment #4 from Cheng-Chia Tseng pswo10...@gmail.com --- One of my freind guesses that this issue should be related to stc_char.dic [1]. You can see 着:著 listed as 1182 item. In this case, 着 and 著 is regarded as two characters which has different meaning in mainland China (Simplified Chinese) and Hong Kong (Traditional Chinese) while 着 is treated as a variant form of 著 which has the same meaning in Taiwan (Traditional Chinese) [2]. This existing conversion rule is only true for Traditional Chinese users in Taiwan, but not for the rest (China and Hong Kong). Listed below: Simplified Chinese to Traditional Chinese 着 = 著 True for Traditional Chinese, Taiwan 着 = 著 False for Traditional Chinese, Hong Kong Traditional Chinese to Simplified Chinese 著 = 着 Conditional True for Simplified Chinese, China The easiest way to fix this issue is to remove 着:著 in the list because those two characters are expected as different in Hong Kong and China. 1. http://cgit.freedesktop.org/libreoffice/core/tree/i18npool/source/textconversion/data/stc_char.dic 2. http://dict.variants.moe.edu.tw/yitia/fra/fra03506.htm -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 57536] Wrong Chinese conversion: 著 着
https://bugs.freedesktop.org/show_bug.cgi?id=57536 --- Comment #5 from Cheng-Chia Tseng pswo10...@gmail.com --- However, I am not a promgrammer. I am not sure if the guessing is right or not. It should be investgated. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 61157] New: [calc] ODS to XLSX conversion not working
https://bugs.freedesktop.org/show_bug.cgi?id=61157 Priority: medium Bug ID: 61157 Keywords: regression Assignee: libreoffice-bugs@lists.freedesktop.org Summary: [calc] ODS to XLSX conversion not working Severity: normal Classification: Unclassified OS: All Reporter: gmocs...@gmail.com Hardware: Other Status: UNCONFIRMED Version: unspecified Component: Libreoffice Product: LibreOffice Created attachment 75162 -- https://bugs.freedesktop.org/attachment.cgi?id=75162action=edit example file When saving the file in attachment as .xlsx (Microsoft Excel 2007/2010 XML), defined function on cell (matrix multiplication) C4 disappears. Also, if you save it to the older fomat (.xml, Excel 2003), this conversion works correctly. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 59629] Custom animation: only the first line is animated
https://bugs.freedesktop.org/show_bug.cgi?id=59629 tbehr...@suse.com changed: What|Removed |Added Assignee|libreoffice-b...@lists.free |tbehr...@suse.com |desktop.org | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 47689] mdimporter module causes mdworker32 to crash
https://bugs.freedesktop.org/show_bug.cgi?id=47689 tbehr...@suse.com changed: What|Removed |Added Assignee|t...@documentfoundation.org |libreoffice-b...@lists.free ||desktop.org CC||tbehr...@suse.com, ||tlillqv...@suse.com -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 34085] [EDITING] [UI] List of fonts incomplete in context menu
https://bugs.freedesktop.org/show_bug.cgi?id=34085 tbehr...@suse.com changed: What|Removed |Added Assignee|tbehr...@suse.com |libreoffice-b...@lists.free ||desktop.org --- Comment #4 from tbehr...@suse.com --- Un-claiming this bug. Cannot currently commit time to it. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 47689] mdimporter module causes mdworker32 to crash
https://bugs.freedesktop.org/show_bug.cgi?id=47689 --- Comment #8 from Tor Lillqvist tlillqv...@suse.com --- The attached crash logs unfortunately don't really give much hints what the problem in our importer code is/was. Luckily (?), our Spotlight importer code hasn't actually even been invoked after LibreOffice 3.5, I think, so these crashes haven't been seen in more recent versions... I recently noticed that the importer isn't working, because the required symbol in the importer (which is actually a dynamic library) was not exported. And after that was fixed, another problem in the importer that caused it to not actually handle the ODF documents that it is supposed to handle was found and fixed. In my very light testing, it seems to work now. But whether we should dare include a thusly fixed importer it in 4.0.1 or not, I don't know. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 37035] Mac crash when using FreeSans 1.27 (circa 2003)
https://bugs.freedesktop.org/show_bug.cgi?id=37035 tbehr...@suse.com changed: What|Removed |Added Assignee|tbehr...@suse.com |libreoffice-b...@lists.free ||desktop.org --- Comment #19 from tbehr...@suse.com --- Whoops, freeing this bug for easyhack takers. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
