Re: About erasing iterators (ohierarchyholder.cxx, package module)

[Julien Nabet]

On 27/08/2013 09:04, Jan Holesovsky wrote:

 289 void OHierarchyElement_Impl::RemoveElement( const ::rtl::Reference<
OHierarchyElement_Impl>&  aRef )
 290 {
 291 {
 292 ::osl::MutexGuard aGuard( m_aMutex );
 293 OHierarchyElementList_Impl::iterator aIter =
m_aChildren.begin();
 294 const OHierarchyElementList_Impl::const_iterator aEnd =
m_aChildren.end();
 295 while (aIter != aEnd)
 296 {
 297 if (aIter->second == aRef )
 298 aIter = m_aChildren.erase(aIter);
 299 else
 300 ++aIter;
 301 }
 302 }
See
http://opengrok.libreoffice.org/xref/core/package/source/xstor/ohierarchyholder.cxx#298

Is it ok to use "aEnd" or, since erase may  be called, we should change the
while into:
while (aIter != m_aChildren.end())
(and remove aEnd)
In this exact case (when the value may be present more times in the
vector), you might want to use the Erase-remove idiom [1]:

// remove all occurrences of aRef
m_aChildren.erase(std::remove(m_aChildren.begin(), m_aChildren.end(), aRef), 
m_aChildren.end());

Even with the comment I suppose, so that people who haven't read tons of
C++ books can see what's going on ;-)

I copy pasted this exact line and it failed to compile :-(

Another thing: couldn't we break the loop after erase or could aRef be
present several times?

Not sure - worth checking the history of that file I think.
According to git history, it's been like this since first git log, so 
let's let this.
About end iterator, it was my fault since I had created a const end 
iterator in the beginning of this year. I've fixed this (see 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=9ebcd5ec54ec5d77cf46849f7f00bf915644f6e1)


Julien
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: package/source

[Julien Nabet]

 package/source/xstor/ohierarchyholder.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 9ebcd5ec54ec5d77cf46849f7f00bf915644f6e1
Author: Julien Nabet 
Date:   Wed Aug 28 08:39:26 2013 +0200

End iterator might not be const

Change-Id: I95c003762e79e606fdae7fd11b1ce79fe8d0

diff --git a/package/source/xstor/ohierarchyholder.cxx 
b/package/source/xstor/ohierarchyholder.cxx
index 8edec16..bbd54da 100644
--- a/package/source/xstor/ohierarchyholder.cxx
+++ b/package/source/xstor/ohierarchyholder.cxx
@@ -291,8 +291,7 @@ void OHierarchyElement_Impl::RemoveElement( const 
::rtl::Reference< OHierarchyEl
 {
 ::osl::MutexGuard aGuard( m_aMutex );
 OHierarchyElementList_Impl::iterator aIter = m_aChildren.begin();
-const OHierarchyElementList_Impl::const_iterator aEnd = 
m_aChildren.end();
-while (aIter != aEnd)
+while (aIter != m_aChildren.end())
 {
 if (aIter->second == aRef )
 aIter = m_aChildren.erase(aIter);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News 2013-08-28

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

+ Expert config page moved to advanced page
  in https://gerrit.libreoffice.org/5653 from Efe Gürkan Yalaman
+ Parsing 'presobj' properties from 'objectlist.xml': gsoc-impresslayout
  in https://gerrit.libreoffice.org/5652 from Vishv Brahmbhatt
+ fdo#57950: Remove some chained appends in i18nlangtag
  in https://gerrit.libreoffice.org/5601 from Jelle van der Waa
+ startcenter: Add toggle to view templates in Start Center
  in https://gerrit.libreoffice.org/5543 from Krisztian Pinter
+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ fdo#66401: fix for combined characters
  in https://gerrit.libreoffice.org/5018 from Adam CloudOn
+ Cross-platform libvlc loading.
  in https://gerrit.libreoffice.org/5627 from Minh Ngo
+ Fix windows libo crash with graphite fonts.
  in https://gerrit.libreoffice.org/5644 from Martin Hosken
+ more debug logs, extra debug layer, file is not used in p3k
  in https://gerrit.libreoffice.org/5267 from James Michael Dupont
+  fdo#66279 - MathML export: use the operator dictionary
  in https://gerrit.libreoffice.org/4671 from Frédéric Wang
+ Remove old outdated gallery images and sounds
  in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt
+ Try to simplify/optimize a bit
  in https://gerrit.libreoffice.org/5641 from Julien Nabet


* Merged changes on master for project core changed in the last 25 hours:

+ Simplify a bit iterator + remove double check
  in https://gerrit.libreoffice.org/5639 from Julien Nabet
+ fdo#62475 removed pointless comments
  in https://gerrit.libreoffice.org/5484 from Jelle van der Waa
+ interpr/vlookup: use ScMatrix func to find matching cells
  in https://gerrit.libreoffice.org/5455 from Pierre-Eric Pelloux-Prayer
+ matrix: add functions to lookup a double or string in columns
  in https://gerrit.libreoffice.org/5454 from Pierre-Eric Pelloux-Prayer
+ get rid of unnecessary warning
  in https://gerrit.libreoffice.org/5586 from Winfried Donkers
+ fix uneditable field in memory option page
  in https://gerrit.libreoffice.org/5640 from Faisal al-otaibi


* Abandoned changes on master for project core changed in the last 25 hours:

+ fdo#67104: Default value of 'Show cell grid lines' checkbox on sidebar
  in https://gerrit.libreoffice.org/5260 from Prashant Pandey
+ Math Embedded Fonts: Added Font tab to document...
  in https://gerrit.libreoffice.org/4931 from Marcos Souza


* Open changes needing tweaks, but being untouched for more than a week:

+ fdo#64817 : fix for rectangle with image fill
  in https://gerrit.libreoffice.org/4718 from Adam CloudOn
+ fdo#66577: non-fractional widths with Core Text
  in https://gerrit.libreoffice.org/5023 from Khaled Hosny


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[GSOC]Slide Layout Extendibility :Weekly Report

[Vishv Brahmbhatt]

Hello Everyone,

Here is the 
Link
to
my blog for the weekly report update.

Thanks & Regards,
Vishv Brahmbhatt

On Sun, Jul 14, 2013 at 8:31 PM, Vishv Brahmbhatt <
vishvbrahmbhat...@gmail.com> wrote:

> Hello Everyone,
>
> Here is the 
> Link
>  to
> my blog for the weekly report update.
>
> Thanks & Regards,
> Vishv Brahmbhatt
>
> On Mon, Jul 8, 2013 at 9:10 PM, Vishv Brahmbhatt <
> vishvbrahmbhat...@gmail.com> wrote:
>
>> Hello Everyone,
>> In the beginning of the week,I was able to complete the required changes
>> in XML parser function(for extracting slide layout information).
>>
>> But,after that I was caught up with the unit-test error(related to
>> configuration XML file) for rest of the 4 days.It seemed to me as a bug in
>> the unit-test process,because in-spite of having made proper entry in the
>> "Package_unittest.mk" and  "layoutlist.xml"  being  added at "unit-test"
>> file-path,the error came up(with wrongly generated path). I have already
>> posted my question to mailing-list 
>> Link
>>  and
>> I am thankful for the reply from Markus.
>> And I will soon resolve this error with appropriate guidance and
>> discussion on mailing-list/ IRC.
>>
>> As of now ,I have moved ahead with addition of some new layouts to
>> "layoutlist.xml". I will peak up more speed from now on-wards.
>>
>> Also for the current status:
>> + I pushed one commit with required changes(last week).
>> + XML parser works in-spite of unit-test errors.
>> + So information from configuration XML file "layoutlist.xml" is
>> extracted perfectly.
>>
>> Thanks & Regards,
>> Vishv Brahmbhatt
>>
>> On Mon, Jul 1, 2013 at 8:30 PM, Vishv Brahmbhatt <
>> vishvbrahmbhat...@gmail.com> wrote:
>>
>>> Hello Everyone,
>>>
>>> Here is the  
>>> Link
>>> to my blog for the weekly report update.
>>>
>>> Thanks & Regards,
>>> Vishv Brahmbhatt
>>>
>>>
>>> On Fri, Jun 21, 2013 at 6:34 PM, Vishv Brahmbhatt <
>>> vishvbrahmbhat...@gmail.com> wrote:
>>>
 Hello Everyone,

 Before the beginning of  this week ,I was debugging on impress slide
 layouts.Basically,I got to understand the mechanism of creation of slide
 layouts in the "normal" page,in the master pages like "notes" and "handout"
 and much more.

 Currently in the slide layouts, Placeholder object's
 height,width,position are hard-coded. So,I did following things during this
 week:

 +So at first ,I started with creation of XML file  which stores
 following information:
 (1) Layout Type
 (2) "PresObj" Kind
 (3) Position co-ordinates of "PresObj"
 (4) Size of "PreObj"(Width and Height)

 + I have started coding XML parser, which will read this information
 from XML file and set the appropriate parameters in the function
 "CalcAutoLayoutRectangles" (This function  calculates/sets  the Top
 Position,Height and Width of Rectangle "PresObj" used.) And this will
 parser will help in bringing configurability with Slide Layouts.

 + So XML parser should be fully completed, probably by "Monday" or
 "Tuesday"(mostly it should get completed by this weekend).

 + Next week,I will work on  understanding "Slide Mater View" and  on
 using "Slide Mater View" to edit the current built-in layouts.

 Regards,
 Vishv Brahmbhatt

>>>
>>>
>>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Making deb from libreoffice source on Debian Wheezy

[Christian Lohmaier]

Hi *,

On Tue, Aug 27, 2013 at 9:10 PM, Krunoslav Šebetić  wrote:
> I cloned git this morning and can't make debs from source, './autogen.sh'
> and 'make' do their job fine, but 'make deb-pkg' doesn't work,
> 'checkinstall' also fails to build the pacages. I would like to make deb
> files

The build system creates deb/rpm using epm utility. So you have to
enable epm (--enable-epm to use version that is built when compiling
libreoffice, alternatively you can also use system wide installed epm,
given it is recent enough and has the fixes that were created by
OOo/LO)
--with-packageformat then can be used to set what package types you
want. you can select both rpm and deb (if you have both rpmbuild as
well as the dpkg tools installed), or just one.

If you really want deb files similar to those distributed on the
libreoffice website, you should use --with-distro=LibreOfficeLinux
- that sets almost all the switches used for the release builds
(mainly not using system libraries, explicitly enable some features,
explicitly disable others)

If you only want debs, then --enable-epm and --with-package-format=deb
is enough.

ciao
Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

China.Action.Money. Complimentary report

[Pacific Tycoon]

Pacific Tycoon Email

Your monthly China investment report


Subscribe to our free monthly China investment report

Click here >>
http://successfuldeliver.com/link.php?M=79314086&N=1988&L=877&F=T

In this month's report:


China's Government - reform in 2013 and the effect on private investment
Industrial Might - China versus America
Industry Views - economists' views from Barclays PLC and the World bank
Provincial versus national investment




Investing does not have to be boring! >>
http://successfuldeliver.com/link.php?M=79314086&N=1988&L=877&F=T




Published by


Pacific Tycoon, Level 11, Admiralty Centre Tower 2, 18 Harcourt Road,
Admiralty, Hong Kong.
Hong Kong Office telephone: +852 580 80130 | Hong Kong Fax: +852 3656 7927

Website: www.pacifictycoon.com
Member of Hong Kong Shipowners Association
Member of Container Owners Association
Member of The International Association of Ports and Harbors
Click this link to unsubscribe:
http://successfuldeliver.com/unsubscribe.php?M=79314086&C=72ab8b3caf2a5ba0acf0f0b9911bcfa4&L=724&N=1988
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: toolkit/source

[Julien Nabet]

 toolkit/source/controls/tree/treedatamodel.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 711535f7667345b61b5b29de283894b30b400b18
Author: Julien Nabet 
Date:   Tue Aug 27 23:41:57 2013 +0200

Shouldn't be removed

Thank you Thorsten!
(See https://gerrit.libreoffice.org/#/c/5639/)

Change-Id: I933a318ba83c63fa2d7eaa0ecb616b1d3a14b097

diff --git a/toolkit/source/controls/tree/treedatamodel.cxx 
b/toolkit/source/controls/tree/treedatamodel.cxx
index 292d685..c8859a2 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -447,6 +447,9 @@ void SAL_CALL MutableTreeNode::removeChildByIndex( 
sal_Int32 nChildIndex ) throw
 xImpl = (*aIter);
 maChildren.erase( aIter );
 
+if( !xImpl.is() )
+throw IndexOutOfBoundsException();
+
 xImpl->setParent(0);
 xImpl->mbIsInserted = false;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSOC] about:config utility a.k.a Expert Config - Weekly Report #10

[Efe Gürkan YALAMAN]

Hi,

Last week I worked on performance issues of page load. Learned using
callgrind and how to use output(Special thanks to Thorsten). After doing
some profiling I figured out the main problem issues on page. And last 2
days I moved the page to the Advanced page.

So-
==What I did==
-Profiling,
-Moving it to the Advanced page as mentioned before.

==Profiling results==
There are 2 main problems on the page.
-Page collects all settings with a recursive function. And it causes a long
wait on page load. There is about 25K options in total( wow! :) )
-Clicking on header's causes a long wait. We figured out there is a costy
function on SvTreeList class (It was sortChildren I think.).


So this week I will try to optimize the problematic part of the code and
other things on to-do list.


Best,

-- 
Efe Gürkan YALAMAN
http://about.me/efegurkan
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - sfx2/source svtools/source

[Julien Nabet]

 sfx2/source/control/thumbnailviewacc.cxx |   30 --
 svtools/source/control/valueacc.cxx  |   30 --
 2 files changed, 16 insertions(+), 44 deletions(-)

New commits:
commit 9aca3570c5e4990f591900e3702efa14958776f4
Author: Julien Nabet 
Date:   Tue Aug 27 23:37:32 2013 +0200

Spread "Use std::find()" part2

Change-Id: I58e6f189c950dbaa5b71bb1b040f9eff20c50796

diff --git a/svtools/source/control/valueacc.cxx 
b/svtools/source/control/valueacc.cxx
index e92b7ca..01c60af 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -384,18 +384,11 @@ void SAL_CALL ValueSetAcc::removeAccessibleEventListener( 
const uno::Reference<
 
 if( rxListener.is() )
 {
-::std::vector< uno::Reference< accessibility::XAccessibleEventListener 
> >::const_iterator aEnd = mxEventListeners.end();
+::std::vector< uno::Reference< accessibility::XAccessibleEventListener 
> >::iterator aIter =
+std::find(mxEventListeners.begin(), mxEventListeners.end(), 
rxListener);
 
-for(::std::vector< uno::Reference< 
accessibility::XAccessibleEventListener > >::iterator aIter = 
mxEventListeners.begin();
-  aIter != aEnd;
-  ++aIter)
-{
-if( *aIter == rxListener )
-{
-mxEventListeners.erase(aIter);
-break;
-}
-}
+if (aIter != mxEventListeners.end())
+mxEventListeners.erase(aIter);
 }
 }
 
@@ -1047,18 +1040,11 @@ void SAL_CALL 
ValueItemAcc::removeAccessibleEventListener( const uno::Reference<
 
 if( rxListener.is() )
 {
-::std::vector< uno::Reference< accessibility::XAccessibleEventListener 
> >::const_iterator aEnd = mxEventListeners.end();
+::std::vector< uno::Reference< accessibility::XAccessibleEventListener 
> >::iterator aIter =
+std::find(mxEventListeners.begin(), mxEventListeners.end(), 
rxListener);
 
-for(::std::vector< uno::Reference< 
accessibility::XAccessibleEventListener > >::iterator aIter = 
mxEventListeners.begin();
-  aIter != aEnd;
-  ++aIter)
-{
-if( *aIter == rxListener )
-{
-mxEventListeners.erase(aIter);
-break;
-}
-}
+if (aIter != mxEventListeners.end())
+mxEventListeners.erase(aIter);
 }
 }
 
commit 834464c787de9935a6f7f1e50c21426fb868df5f
Author: Julien Nabet 
Date:   Tue Aug 27 23:32:10 2013 +0200

Spread "Use std::find()"

Change-Id: I710cc7aeea494c69ae0df720db857d2759e70654

diff --git a/sfx2/source/control/thumbnailviewacc.cxx 
b/sfx2/source/control/thumbnailviewacc.cxx
index b398186..3f61244 100644
--- a/sfx2/source/control/thumbnailviewacc.cxx
+++ b/sfx2/source/control/thumbnailviewacc.cxx
@@ -307,18 +307,11 @@ void SAL_CALL 
ThumbnailViewAcc::removeAccessibleEventListener( const uno::Refere
 
 if( rxListener.is() )
 {
-std::vector< uno::Reference< accessibility::XAccessibleEventListener > 
>::const_iterator aEnd = mxEventListeners.end();
+std::vector< uno::Reference< accessibility::XAccessibleEventListener > 
>::iterator aIter =
+std::find(mxEventListeners.begin(), mxEventListeners.end(), 
rxListener);
 
-for (std::vector< uno::Reference< 
accessibility::XAccessibleEventListener > >::iterator aIter = 
mxEventListeners.begin();
-   aIter != aEnd;
-   ++aIter)
-{
-if( *aIter == rxListener )
-{
-mxEventListeners.erase( aIter );
-break;
-}
-}
+if (aIter != mxEventListeners.end())
+mxEventListeners.erase( aIter );
 }
 }
 
@@ -823,18 +816,11 @@ void SAL_CALL 
ThumbnailViewItemAcc::removeAccessibleEventListener( const uno::Re
 
 if( rxListener.is() )
 {
-::std::vector< uno::Reference< accessibility::XAccessibleEventListener 
> >::const_iterator aEnd = mxEventListeners.end();
+std::vector< uno::Reference< accessibility::XAccessibleEventListener > 
>::iterator aIter =
+std::find(mxEventListeners.begin(), mxEventListeners.end(), 
rxListener);
 
-for (::std::vector< uno::Reference< 
accessibility::XAccessibleEventListener > >::iterator aIter = 
mxEventListeners.begin();
- aIter != aEnd;
- ++aIter)
-{
-if( *aIter == rxListener )
-{
-mxEventListeners.erase( aIter );
-break;
-}
-}
+if (aIter != mxEventListeners.end())
+mxEventListeners.erase( aIter );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: lo-submodules-from-bundles.sh

[Christian Lohmaier]

 lo-submodules-from-bundles.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8fd14119d29b5ed4d8772db399a9fd3557dcca92
Author: Christian Lohmaier 
Date:   Tue Aug 27 23:34:41 2013 +0200

old versions only of mktemp only know -t but not --tmpdir

diff --git a/lo-submodules-from-bundles.sh b/lo-submodules-from-bundles.sh
index 758bc14..b75044c 100755
--- a/lo-submodules-from-bundles.sh
+++ b/lo-submodules-from-bundles.sh
@@ -138,7 +138,7 @@ fi
 workdir=$(mktemp -d --tmpdir="$currentdir" git_from_bundle_XXX)
 if [ -z "$workdir" ] ; then
 echo "creating workdir failed - trying in temporary directory"
-workdir=$(mktemp -d --tmpdir git_from_bundle_XXX)
+workdir=$(TMPDIR="$currentdir" mktemp -d -t git_from_bundle_XXX)
 if [ -z "$workdir" ] ; then echo "giving up "; exit 1; fi
 fi
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - connectivity/source

[Andrzej J . R . Hunt]

 connectivity/source/drivers/firebird/PreparedStatement.cxx   |  131 ++-
 connectivity/source/drivers/firebird/PreparedStatement.hxx   |   26 +-
 connectivity/source/drivers/firebird/Statement.cxx   |   24 --
 connectivity/source/drivers/firebird/StatementCommonBase.cxx |   96 +++-
 connectivity/source/drivers/firebird/StatementCommonBase.hxx |6 
 5 files changed, 196 insertions(+), 87 deletions(-)

New commits:
commit 7bc88db8c500b41fe926fb99cd403accd696e671
Author: Andrzej J.R. Hunt 
Date:   Tue Aug 27 20:52:37 2013 +0100

Implemet setNull. (firebird-sdbc)

Change-Id: I9fd53a5e8b5d1dba467fa8064f9f2ea1b93f26df

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 00f7b0e..2c59931 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -323,6 +323,16 @@ Reference< XResultSet > SAL_CALL 
OPreparedStatement::executeQuery()
 }
 
 //- XParameters ---
+void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 nSqlType)
+throw(SQLException, RuntimeException)
+{
+(void) nSqlType;
+MutexGuard aGuard( m_pConnection->getMutex() );
+checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
+
+setParameterNull(nIndex, true);
+}
+
 void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 nIndex, sal_Bool x)
 throw(SQLException, RuntimeException)
 {
@@ -458,16 +468,6 @@ void SAL_CALL OPreparedStatement::setFloat( sal_Int32 
parameterIndex, float x )
 }
 // -
 
-void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 
sqlType ) throw(SQLException, RuntimeException)
-{
-(void) parameterIndex;
-(void) sqlType;
-::osl::MutexGuard aGuard( m_pConnection->getMutex() );
-checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
-
-}
-// -
-
 void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const 
Reference< XClob >& x ) throw(SQLException, RuntimeException)
 {
 (void) parameterIndex;
commit 186f264dc2ac45c3de16a651b64de77794589eab
Author: Andrzej J.R. Hunt 
Date:   Tue Aug 27 20:50:44 2013 +0100

Implement set[Int|Long]. (firebird-sdbc)

Change-Id: I234b8f136b90f56c689553d0df8ec2d473a92225

diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx 
b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 004d191..00f7b0e 100644
--- a/connectivity/source/drivers/firebird/PreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -335,17 +335,17 @@ void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 
nIndex, sal_Bool x)
 // it might be best to just determine the db type and set as appropriate?
 }
 
-void SAL_CALL OPreparedStatement::setByte(sal_Int32 nIndex, sal_Int8 x)
+void SAL_CALL OPreparedStatement::setByte(sal_Int32 nIndex, sal_Int8 nValue)
 throw(SQLException, RuntimeException)
 {
 (void) nIndex;
-(void) x;
+(void) nValue;
 ::dbtools::throwFunctionNotSupportedException("setByte not supported in 
firebird",
   *this,
   Any());
 }
 
-void SAL_CALL OPreparedStatement::setShort(sal_Int32 nIndex, sal_Int16 x)
+void SAL_CALL OPreparedStatement::setShort(sal_Int32 nIndex, sal_Int16 nValue)
 throw(SQLException, RuntimeException)
 {
 MutexGuard aGuard( m_pConnection->getMutex() );
@@ -362,7 +362,47 @@ void SAL_CALL OPreparedStatement::setShort(sal_Int32 
nIndex, sal_Int16 x)
 if (dtype != SQL_SHORT)
 throw SQLException(); // TODO: cast instead?
 
-memcpy(pVar->sqldata, &x, 2);
+memcpy(pVar->sqldata, &nValue, sizeof(nValue));
+}
+
+void SAL_CALL OPreparedStatement::setInt(sal_Int32 nIndex, sal_Int32 nValue)
+throw(SQLException, RuntimeException)
+{
+MutexGuard aGuard( m_pConnection->getMutex() );
+checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
+ensurePrepared();
+
+checkParameterIndex(nIndex);
+setParameterNull(nIndex, false);
+
+XSQLVAR* pVar = m_pInSqlda->sqlvar + (nIndex - 1);
+
+int dtype = (pVar->sqltype & ~1); // drop flag bit for now
+
+if (dtype != SQL_LONG)
+throw SQLException(); // TODO: cast instead?
+
+memcpy(pVar->sqldata, &nValue, sizeof(nValue));
+}
+
+void SAL_CALL OPreparedStatement::setLong(sal_Int32 nIndex, sal_Int64 nValue)
+throw(SQLException, RuntimeException)
+{
+MutexGuard aGuard( m_pConnection->getMutex() );
+checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed);
+ensurePrepared();
+
+checkParameterIndex(nIndex);
+setParameterNull(nIndex, false);
+
+XSQLVAR* pVar = m_pInSqlda->sqlvar + (nInd

Re: Making deb from libreoffice source on Debian Wheezy

[Michael Stahl]

On 27/08/13 21:10, Krunoslav Šebetić wrote:
> Hi,
> 
> I cloned git this morning and can't make debs from source,
> './autogen.sh' and 'make' do their job fine, but 'make deb-pkg' doesn't
> work, 'checkinstall' also fails to build the pacages. I would like to
> make deb files so I could install cloned git in parallel with 4.0.5, not
> the other way around, I wont 4.0.5 installed normally and 4.2 do as
> parallel installation.
> 
> I can install 4.2 with 'make install' but don't know how to remove
> libreoffice installed with 'make install'|| ones I decide to clone new
> version from git. This also forces me to have 4.0.5 as parallel
> installation instead as primary installation.
> 
> So - how to make deb (like one downloadable from libreoffice web site)
> so I can install 4.2 in parallel with 4.0.5?

the general idea is to use --with-package-format=deb but if you say that
doesn't work for you you can also use --with-package-format=archive
which results in a most convenient tarball (but no system integration
i.e. no desktop menus/mime-type registrations) or even
--with-package-format=rpm (easily installable even on Debian based
distros but also without system integration).

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - toolkit/source tools/source ucb/source unotools/source vcl/source vcl/unx

[Takeshi Abe]

 toolkit/source/awt/vclxtoolkit.cxx |   18 +-
 tools/source/datetime/tdate.cxx|2 +-
 tools/source/zcodec/zcodec.cxx |2 +-
 ucb/source/core/ucbprops.cxx   |2 +-
 unotools/source/config/pathoptions.cxx |4 ++--
 unotools/source/misc/fontcvt.cxx   |   10 +-
 vcl/source/edit/texteng.cxx|6 +++---
 vcl/source/filter/ixpm/rgbtable.hxx|2 +-
 vcl/source/fontsubset/sft.cxx  |2 +-
 vcl/source/gdi/impvect.cxx |   18 +-
 vcl/source/gdi/outmap.cxx  |4 ++--
 vcl/unx/gtk/window/gtksalframe.cxx |2 +-
 vcl/unx/kde/fpicker/kdefpmain.cxx  |2 +-
 13 files changed, 37 insertions(+), 37 deletions(-)

New commits:
commit eb6ab3bc045701e3d4b8751751700d8375f89fcc
Author: Takeshi Abe 
Date:   Wed Aug 28 04:53:50 2013 +0900

Mark as const

Change-Id: If20ac542f31dd650d6d1cc22ced618f73e1ce773

diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 11f1917..719219a 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.cxx
@@ -32,7 +32,7 @@ struct tm *localtime_r(const time_t *timep, struct tm 
*buffer);
 }
 #endif
 
-static sal_uInt16 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
+static const sal_uInt16 aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,
31, 31, 30, 31, 30, 31 };
 
 #define MAX_DAYS3636532
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index 497662c..8d23861 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.cxx
@@ -35,7 +35,7 @@
 #define GZ_COMMENT  0x10 /* bit 4 set: file comment present */
 #define GZ_RESERVED 0xE0 /* bits 5..7: reserved */
 
-static int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */
+static const int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */
 
 ZCodec::ZCodec( sal_uIntPtr nInBufSize, sal_uIntPtr nOutBufSize, sal_uIntPtr 
nMemUsage )
 : mnCRC(0)
diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx
index 2207a05..ee61cb6 100644
--- a/ucb/source/core/ucbprops.cxx
+++ b/ucb/source/core/ucbprops.cxx
@@ -164,7 +164,7 @@ static const com::sun::star::uno::Type& 
Sequence_SendMediaTypes_getCppuType()
 
 #define ATTR_DEFAULT ( PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID 
| PropertyAttribute::MAYBEDEFAULT )
 
-static PropertyTableEntry __aPropertyTable[] =
+static const PropertyTableEntry __aPropertyTable[] =
 {
 { "Account",-1, ATTR_DEFAULT,  
 &OUString_getCppuType },
 { "AutoUpdateInterval", -1, ATTR_DEFAULT,  
 &sal_uInt32_getCppuType },
diff --git a/unotools/source/config/pathoptions.cxx 
b/unotools/source/config/pathoptions.cxx
index 2acbea0..9435505 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.cxx
@@ -196,7 +196,7 @@ struct VarNameAttribute
 VarNameProperty eVarProperty;   // Which return value is needed by 
this path variable
 };
 
-static PropertyStruct aPropNames[] =
+static const PropertyStruct aPropNames[] =
 {
 { "Addin",  SvtPathOptions::PATH_ADDIN  },
 { "AutoCorrect",SvtPathOptions::PATH_AUTOCORRECT},
@@ -224,7 +224,7 @@ static PropertyStruct aPropNames[] =
 { "Fingerprint",SvtPathOptions::PATH_FINGERPRINT}
 };
 
-static VarNameAttribute aVarNameAttribute[] =
+static const VarNameAttribute aVarNameAttribute[] =
 {
 { SUBSTITUTE_INSTPATH,  VAR_NEEDS_SYSTEM_PATH },// $(instpath)
 { SUBSTITUTE_PROGPATH,  VAR_NEEDS_SYSTEM_PATH },// $(progpath)
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 516a05a..277afed 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1404,7 +1404,7 @@ void ConvertChar::RecodeString( OUString& rStr, sal_Int32 
nIndex, sal_Int32 nLen
 
 struct RecodeTable { const char* pOrgName; ConvertChar aCvt;};
 
-static RecodeTable aStarSymbolRecodeTable[] =
+static const RecodeTable aStarSymbolRecodeTable[] =
 {
 // the first two entries must be StarMath and StarBats; do not reorder!
 // reason: fgrep for FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS
@@ -1428,7 +1428,7 @@ static RecodeTable aStarSymbolRecodeTable[] =
 {"mtextra", {aMTExtraTab, "StarSymbol", NULL}}
 };
 
-static RecodeTable aAppleSymbolRecodeTable[] = {
+static const RecodeTable aAppleSymbolRecodeTable[] = {
 {"symbol", {aAdobeSymbolToAppleSymbolTab, "AppleSymbol", NULL}}
 };
 
@@ -1451,7 +1451,7 @@ const ConvertChar* ConvertChar::GetRecodeData( const 
OUString& rOrgFontName, con
 int nEntries = SAL_N_ELEMENTS(aStarSymbolRecodeTable);
 for( int i = 0; i < nEntries; ++i)
 {
-RecodeTable& r = aStarSymbolRecodeTable[i];
+const RecodeTable& r = aStarSymbolRecodeTable[i];
 if( aOrgName.e

Re: eot embedded fonts

[Lubos Lunak]

On Tuesday 27 of August 2013, Brennan T Vincent wrote:
> Thanks Lubos
>
> I should clarify, I already have an eot->ttf converter working; proof

 Ah, I read this the other way around the first time.

> positive that MS and Monotype's documentation is sufficient :). I just need
> to clean up the code, write some unit tests, etc. before I am comfortable
> submitting it to LibreOffice.
>
> I'll take a look at EmbeddedFontsHelper

 So in that case it should be sufficient just to detect EOT and convert it to 
TTF in the function that adds a font for LO's use, and convert or reuse back 
when writing out a document.

-- 
 Lubos Lunak
 l.lu...@suse.cz
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Making deb from libreoffice source on Debian Wheezy

[Krunoslav Šebetić]

At least is there an easy way to reinstall libreoffice 4.2 when I clone 
git again in a month or so? How to replace current 4.2 installation with 
newer; would ./autogen.sh - make - make install do every thing I need or 
previous version should be uninstalled?


Kruno


On 08/27/2013 09:10 PM, Krunoslav Šebetić wrote:

Hi,

I cloned git this morning and can't make debs from source, 
'./autogen.sh' and 'make' do their job fine, but 'make deb-pkg' 
doesn't work, 'checkinstall' also fails to build the pacages. I would 
like to make deb files so I could install cloned git in parallel with 
4.0.5, not the other way around, I wont 4.0.5 installed normally and 
4.2 do as parallel installation.


I can install 4.2 with 'make install' but don't know how to remove 
libreoffice installed with 'make install'|| ones I decide to clone new 
version from git. This also forces me to have 4.0.5 as parallel 
installation instead as primary installation.


So - how to make deb (like one downloadable from libreoffice web site) 
so I can install 4.2 in parallel with 4.0.5?


Kruno


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Making deb from libreoffice source on Debian Wheezy

[Krunoslav Šebetić]

Hi,

I cloned git this morning and can't make debs from source, 
'./autogen.sh' and 'make' do their job fine, but 'make deb-pkg' doesn't 
work, 'checkinstall' also fails to build the pacages. I would like to 
make deb files so I could install cloned git in parallel with 4.0.5, not 
the other way around, I wont 4.0.5 installed normally and 4.2 do as 
parallel installation.


I can install 4.2 with 'make install' but don't know how to remove 
libreoffice installed with 'make install'|| ones I decide to clone new 
version from git. This also forces me to have 4.0.5 as parallel 
installation instead as primary installation.


So - how to make deb (like one downloadable from libreoffice web site) 
so I can install 4.2 in parallel with 4.0.5?


Kruno
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

License statement

[Viktor Varga]

All of my past and future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - Makefile.in solenv/bin solenv/gbuild

[Tor Lillqvist]

 Makefile.in   |   46 ---
 solenv/bin/macosx-codesign-app-bundle |   77 ++
 solenv/bin/modules/installer/simplepackage.pm |   25 
 solenv/gbuild/PythonTest.mk   |1 
 solenv/gbuild/platform/macosx.mk  |6 ++
 5 files changed, 86 insertions(+), 69 deletions(-)

New commits:
commit d00e125cbe33da88b881d177cbc09a9045d32349
Author: Tor Lillqvist 
Date:   Tue Aug 27 19:26:04 2013 +0300

Factor out the app bundle code signing into a script

Call that script for make dev-install and when creating the .dmg.

Change-Id: Ic468cafe04b2755f371d449fef0b84e2fdc7e197

diff --git a/Makefile.in b/Makefile.in
index 16f18b8..eef1aec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -262,10 +262,6 @@ install-strip:
 
 endif # !MACOSX
 
-ifeq ($(ENABLE_MACOSX_SANDBOX),YES)
-entitlements:=--entitlements $(BUILDDIR)/lo.xcent
-endif
-
 dev-install: build
@rm -rf $(DEVINSTALLDIR)
@mkdir $(DEVINSTALLDIR)
@@ -275,47 +271,7 @@ else
 ifeq ($(DISABLE_LINKOO),TRUE)
@ooinstall $(DEVINSTALLDIR)/opt
 ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
-#
-# Sign dylibs
-#
-# Executables get signed right after linking, see
-# solenv/gbuild/platform/macosx.mk. But many of our dylibs are built
-# by ad-hoc or 3rd-party mechanisms, so we can't easily sign them
-# right after linking. So do it here.
-#
-# The dylibs in the Python framework are called *.so. Go figure
-#
-   find $(DEVINSTALLDIR)/opt/LibreOffice.app \( -name '*.dylib' -or -name 
'*.dylib.*' -or -name '*.so' \) ! -type l | \
-while read dylib; do \
-id=`basename "$$dylib"`; \
-case $$id in \
-*.dylib|*.so) \
-;; \
-*.dylib.*) \
-id=`echo $$id | sed -e 's/dylib.*/dylib/'`; \
-;; \
-esac; \
-codesign --verbose --identifier=$(MACOSX_BUNDLE_IDENTIFIER).$$id 
--sign $(MACOSX_CODESIGNING_IDENTITY) "$$dylib"; \
-done
-#
-# Sign frameworks.
-#
-# Yeah, we don't bundle any other framework than our Python one, and
-# it has just one version, so this generic search is mostly for
-# completeness.
-#
-   for framework in `find $(DEVINSTALLDIR)/opt/LibreOffice.app -name 
'*.framework' -type d`; do \
-for version in $$framework/Versions/*; do \
-if test ! -L $$version -a -d $$version; then codesign --force 
--verbose --prefix=$(MACOSX_BUNDLE_IDENTIFIER). --sign 
$(MACOSX_CODESIGNING_IDENTITY) $$version; fi; \
-done; \
-done
-#
-# Sign the app bundle as a whole (will sign the soffice binary too)
-#
-# At this stage we also attach the entitlements in the sandboxing case
-#
-   codesign --force --verbose --sign $(MACOSX_CODESIGNING_IDENTITY) 
$(entitlements) $(DEVINSTALLDIR)/opt/LibreOffice.app
-#
+   @macosx-codesign-app-bundle $(DEVINSTALLDIR)/opt/LibreOffice.app
 endif
 ifneq ($(OS),MACOSX)
@install-gdb-printers -L
diff --git a/solenv/bin/macosx-codesign-app-bundle 
b/solenv/bin/macosx-codesign-app-bundle
new file mode 100755
index 000..cbe9fa0
--- /dev/null
+++ b/solenv/bin/macosx-codesign-app-bundle
@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# Script to sign dylibs and frameworks in an app bundle plus the
+# bundle itself. Called from
+# installer::simplepackage::create_package() in
+# solenv/bin/modules/installer/simplepackage.pm
+
+test `uname` = Darwin || { echo This is for OS X only; exit 1; }
+
+test $# = 1 || { echo Usage: $0 app-bundle; exit 1; }
+
+for V in \
+BUILDDIR \
+MACOSX_BUNDLE_IDENTIFIER \
+MACOSX_CODESIGNING_IDENTITY; do
+if test -z `eval echo '$'$V`; then
+   echo No '$'$V "environment variable! This should be run in a build only"
+   exit 1
+fi
+done
+
+APP_BUNDLE=$1
+
+# Sign dylibs
+#
+# Executables get signed right after linking, see
+# solenv/gbuild/platform/macosx.mk. But many of our dylibs are built
+# by ad-hoc or 3rd-party mechanisms, so we can't easily sign them
+# right after linking. So do it here.
+#
+# The dylibs in the Python framework are called *.so. Go figure
+#
+# First sign all files that can use the default identifier in the hope
+# that codesign will contact the timestamp server just once for all
+# mentioned on the command line.
+
+find $APP_BUNDLE \( -name '*.dylib' -or -name '*.so' \) ! -type l | \
+xargs codesign --verbose --prefix=$MACOSX_BUNDLE_IDENTIFIER. --sign 
$MACOSX_CODESIGNING_IDENTITY
+
+find $APP_BUNDLE -name '*.dylib.*' ! -type l | \
+while read dylib; do \
+id=`basename "$dylib"`; \
+id=`echo $id | sed -e 's/dylib.*/dylib/'`; \
+codesign --verbose --identifier=$MACOSX_BUNDLE_IDENTIFIER.$id --sign 
$MACOSX_CODESIGNING_IDENTITY "$dylib"; \
+done
+
+# The executables have already been signed by
+# gb_LinkTarget__command_dynamiclink in
+# solenv/gbuild/platform/macosx.mk.
+
+# Sign frameworks.
+#
+# Yeah, we don't bundle any other framework than our Python one, and
+# it has 

Re: eot embedded fonts

[Khaled Hosny]

On Tue, Aug 27, 2013 at 07:55:05PM +0200, Jan Holesovsky wrote:
> Hi Khaled,
> 
> Khaled Hosny píše v Út 27. 08. 2013 v 19:26 +0200:
> 
> > I just did a quick search and found this library which seems to able to
> > convert the few MTX-compressed eot fonts I have (the fonts were
> > generated using Google’s sfntly library, though):
> > 
> >   https://github.com/umanwizard/libeot
> 
> uman == Brennan T Vincent [see the commit history for confirmation] -
> ie. this is exactly the code Brennan wrote, and wrote about in his
> initial mail ;-)

I should have noticed that, I even read the whole commit history :p

Regards,
Khaled
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: eot embedded fonts

[Jan Holesovsky]

Hi Khaled,

Khaled Hosny píše v Út 27. 08. 2013 v 19:26 +0200:

> I just did a quick search and found this library which seems to able to
> convert the few MTX-compressed eot fonts I have (the fonts were
> generated using Google’s sfntly library, though):
> 
>   https://github.com/umanwizard/libeot

uman == Brennan T Vincent [see the commit history for confirmation] -
ie. this is exactly the code Brennan wrote, and wrote about in his
initial mail ;-)

I am looking forward to the integration of this to LibreOffice!

All the best,
Kendy

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: eot embedded fonts

[Khaled Hosny]

On Tue, Aug 27, 2013 at 05:25:42PM +0200, Lubos Lunak wrote:
> On Tuesday 27 of August 2013, Brennan T Vincent wrote:
> > Hi all,
> >
> > One of the most commonly-occurring problems with .pub import is the fact
> > that we don't respect embedded fonts. Now that LibreOffice supports
> > embedded fonts, it should be possible to make this work.
> 
>  That depends. EOT is a Microsoft proprietary font format (which has been 
> submitted to W3C, but AFAICT pretty much everybody else ignores it).

Google has since convinced Monotype to provide a royalty free license
to its font compression technology used in EOT:

  
http://blog.fonts.com/2012/01/09/monotype-imaging-and-google-collaborate-to-make-web-fonts-better/

I just did a quick search and found this library which seems to able to
convert the few MTX-compressed eot fonts I have (the fonts were
generated using Google’s sfntly library, though):

  https://github.com/umanwizard/libeot

Regards,
Khaled
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: formula/source: get rid of unnecessary warning

[Winfried Donkers]

Hi Eike,

Op 27-08-13 16:20, Eike Rathke wrote:

Hi Winfried,

On Tuesday, 2013-08-27 06:48:28 -0700, Winfried Donkers wrote:


commit e5321437322fd812b93fee266af309e782479488
Author: Winfried Donkers 
Date:   Thu Aug 22 17:03:58 2013 +0200

 get rid of unnecessary warning
 
 A value of 0 for Opcode eOp produces a debug assertion that is

 not in place as opcode with value does exist (ocPush, SC_OPCODE_PUSH).

--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -488,8 +488,8 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > 
FormulaCompiler::OpCodeMap::create
  
  void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const OpCode eOp )

  {
-DBG_ASSERT( 0 < eOp && sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: 
OpCode out of range");
-if (0 < eOp && sal_uInt16(eOp) < mnSymbols)
+DBG_ASSERT( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out of 
range");
+if (sal_uInt16(eOp) < mnSymbols)
  {

When did you encounter that warning?
Putting ocPush into an OpCodeMap probably indicates an error, as ocPush
is not an operator or function that maps to any string. An ocPush is
always used with a cell reference, fixed value or function result.
Unless there is a compelling reason for this change I suggest to revert it.
That warning occurred e.g. on start up of calc. 
FormulaCompiler::OpCodeMap::putOpCode() is called for opCode 0 and then 
for opCode 6 till 412 (as the warning ' reusing opCode'  occurs as many 
times).
As in FormulaCompiler::String& getSymbol() the DBG_ASSERT is called 
without the 0 < eOp, eOp is unsigned (so the expression is about eOp 
equalling 0 only) and other special commands (opCode 1 till 5) aren' t 
excluded, I thought it safe to remove the 0 < eOp from both lines.


I hope this information helps. If you want to revert the change, it may 
be wise to make the DBG_ASSERT expression in FormulaCompiler::String& 
getSymbol() the same and/or check for all special command opCodes (i.e. 
check for eOp > 5).
And of course, fixing the cause of the call of 
FormulaCompiler::OpCodemap::putOpCode() with eOp 0. ;)


Meanwhile, I keep on digging in add-in functions that always appear with 
local function names (fdo#50118)...


Winfried

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 5 commits - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/odbcbase/OResultSet.cxx |   81 +++-
 1 file changed, 48 insertions(+), 33 deletions(-)

New commits:
commit 4033532e9ffb004ab5864401aa1af0c69fc024ec
Author: Lionel Elie Mamane 
Date:   Tue Aug 27 18:28:37 2013 +0200

release m_aLengthVector even when m_aBindVector is empty

Change-Id: Ia3bd53402d436e296005f4f93113cc08daea2421

diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx 
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index a0542a8..0c5de7d 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -195,13 +195,12 @@ void OResultSet::disposing(void)
 OPropertySetHelper::disposing();
 
 ::osl::MutexGuard aGuard(m_aMutex);
-if(!m_aBindVector.empty())
-releaseBuffer();
+releaseBuffer();
 if(m_bFreeHandle)
 
m_pStatement->getOwnConnection()->freeStatementHandle(m_aStatementHandle);
 
-m_xStatement.clear();
-m_xMetaData.clear();
+m_xStatement.clear();
+m_xMetaData.clear();
 }
 // -
 SQLRETURN OResultSet::unbind(sal_Bool _bUnbindHandle)
commit 1c7b0b08b2aad12fa2a295198c235d505c44e0f5
Author: Lionel Elie Mamane 
Date:   Tue Aug 27 18:27:58 2013 +0200

the place reserved for bookmark in m_aBindVector is never used

Change-Id: Iae4850739c329a7b04f8eea75047ab75465e3dea

diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx 
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 99c4e57..a0542a8 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -211,9 +211,9 @@ SQLRETURN OResultSet::unbind(sal_Bool _bUnbindHandle)
 if ( _bUnbindHandle )
 nRet = N3SQLFreeStmt(m_aStatementHandle,SQL_UNBIND);
 
-if ( m_aBindVector.size() > 1 )
+if ( m_aBindVector.size() > 0 )
 {
-TVoidVector::iterator pValue = m_aBindVector.begin() + 1;
+TVoidVector::iterator pValue = m_aBindVector.begin();
 TVoidVector::iterator pEnd = m_aBindVector.end();
 for(; pValue != pEnd; ++pValue)
 {
@@ -271,7 +271,6 @@ SQLRETURN OResultSet::unbind(sal_Bool _bUnbindHandle)
 }
 }
 m_aBindVector.clear();
-m_aBindVector.push_back(TVoidPtr(0,0)); // the first is reserved for 
the bookmark
 }
 return nRet;
 }
@@ -344,8 +343,7 @@ void OResultSet::allocBuffer()
 Reference< XResultSetMetaData > xMeta = getMetaData();
 sal_Int32 nLen = xMeta->getColumnCount();
 
-m_aBindVector.reserve(nLen+1);
-m_aBindVector.push_back(TVoidPtr(0,0)); // the first is reserved for the 
bookmark
+m_aBindVector.reserve(nLen);
 m_aRow.resize(nLen+1);
 
 m_aRow[0].setTypeKind(DataType::VARBINARY);
commit 89c6e2327fa9fb24bf21231c5b7ab9b76bcd5099
Author: Lionel Elie Mamane 
Date:   Tue Aug 27 18:07:14 2013 +0200

odbc insert: unbind as soon bindings not necessary

SQLFetchScroll uses the bound columns, and writes to them.
This has two problems:
1) For non-bookmark columns, this happens in our buffers,
   and at first sight could be innocuous.
   However, it allows the driver to disallow us to use
   SQLGetData on the same columns, which we intend to do...
2) For bookmark column, the "read bookmark from" and
   "write bookmark to" buffers end up being the same.
   This unnecessarily exposes us to driver bugs in this corner case.

Change-Id: I594d34cf5a64564766f06b49c86f8737961573c0

diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx 
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index a35105e..99c4e57 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -896,6 +896,8 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, 
RuntimeException)
 throw;
 }
 
+nRet = unbind();
+
OTools::ThrowException(m_pStatement->getOwnConnection(),nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this);
 
 if ( bPositionByBookmark )
 {
@@ -907,8 +909,6 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, 
RuntimeException)
 nRet = N3SQLFetchScroll(m_aStatementHandle,SQL_FETCH_RELATIVE,0); // 
OJ 06.03.2004
 // sometimes we got an error but we are not interested in anymore #106047# 
OJ
 //  
OTools::ThrowException(m_pStatement->getOwnConnection(),nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this);
-nRet = unbind();
-
OTools::ThrowException(m_pStatement->getOwnConnection(),nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this);
 
 if(m_pSkipDeletedSet)
 {
commit 2939a1fa638f63162f0a9741e139e9439144556b
Author: Lionel Elie Mamane 
Date:   Tue Aug 27 18:03:21 2013 +0200

odbc insert: adjust buffer size *after* it is written to

the buffer (aBookmark) is written to by SQLBulkOperations or
SQLSetPos, not by S

[Libreoffice-commits] core.git: sw/qa

[Miklos Vajna]

 sw/qa/extras/README  |6 -
 sw/qa/extras/inc/swmodeltestbase.hxx |9 ++
 sw/qa/extras/odfexport/odfexport.cxx |4 -
 sw/qa/extras/odfimport/odfimport.cxx |4 -
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   29 +---
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |  112 +++
 sw/qa/extras/rtfexport/rtfexport.cxx |   14 +--
 sw/qa/extras/rtfimport/rtfimport.cxx |   89 +++-
 sw/qa/extras/ww8export/ww8export.cxx |   11 ---
 sw/qa/extras/ww8import/ww8import.cxx |9 --
 10 files changed, 81 insertions(+), 206 deletions(-)

New commits:
commit d9f1c11dfa5a1c8ea579f4a2085c8c8b0e3a31aa
Author: Miklos Vajna 
Date:   Tue Aug 27 16:44:12 2013 +0200

Reduce copy&paste by adding SwModelTestBase::getShape()

Change-Id: I3b73405c546427bb5676db30e297af36c18043e6

diff --git a/sw/qa/extras/README b/sw/qa/extras/README
index 09a9b6d..e933843 100644
--- a/sw/qa/extras/README
+++ b/sw/qa/extras/README
@@ -216,11 +216,7 @@ graphic = image.Graphic
 
 C++:
 
-uno::Reference textDocument(mxComponent, uno::UNO_QUERY);
-uno::Reference drawPageSupplier(textDocument, 
uno::UNO_QUERY);
-uno::Reference drawPage = drawPageSupplier->getDrawPage();
-uno::Reference image;
-drawPage->getByIndex(0) >>= image;
+uno::Reference image = getShape(1);
 uno::Reference graphic = getProperty< uno::Reference< 
graphic::XGraphic > >( image, "Graphic" );
 
 
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 9bd8a46..895c096 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -269,6 +269,15 @@ protected:
 return xCell;
 }
 
+/// Get shape (counted from 1)
+uno::Reference getShape(int number)
+{
+uno::Reference 
xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
+uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
+uno::Reference xShape(xDrawPage->getByIndex(number - 
1), uno::UNO_QUERY);
+return xShape;
+}
+
 void header()
 {
 std::cerr << "File tested,Execution Time (ms)" << std::endl;
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 3089a53..0b104d1 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -375,9 +375,7 @@ void Test::testFdo43807()
 
 void Test::testTextframeTransparentShadow()
 {
-uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Reference xDrawPage = 
xDrawPageSupplier->getDrawPage();
-uno::Reference xPicture(xDrawPage->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xPicture = getShape(1);
 // ODF stores opacity of 75%, that means 25% transparency.
 CPPUNIT_ASSERT_EQUAL(sal_Int32(25), getProperty(xPicture, 
"ShadowTransparence"));
 }
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 92139c1..d5e1c97 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -301,9 +301,7 @@ void Test::testFdo60842()
 
 void Test::testFdo56272()
 {
-uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
-uno::Reference xShape(xDraws->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xShape = getShape(1);
 // Vertical position was incorrect.
 CPPUNIT_ASSERT_EQUAL(sal_Int32(422), xShape->getPosition().Y); // Was -2371
 }
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index e4347dd..0f1e500 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -821,9 +821,7 @@ void Test::testFDO63053()
 
 void Test::testWatermark()
 {
-uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
-uno::Reference xShape(xDraws->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xShape(getShape(1), uno::UNO_QUERY);
 // 1st problem: last character was missing
 CPPUNIT_ASSERT_EQUAL(OUString("SAMPLE"), xShape->getString());
 
@@ -956,9 +954,7 @@ void Test::testFdo66543()
 
 void Test::testN822175()
 {
-uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
-uno::Reference xFrame(xDraws->getByIndex(0), 
uno::UNO_QUERY);
+uno::Reference xFrame(getShape(1), uno::UNO_QUERY);
 // Was text::WrapTextMode_THROUGH, due to missing Surround handling in the 
exporter.
 CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_PARALLEL, 
getProperty(xFrame, "Surround"));
 }
@@ -998,9 +994,7 @@ void Test::testFdo58577()
 
 void Test::testBnc581614()
 {
-uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
-u

Re: [Libreoffice-qa] [ANN] LibreOffice 4.1.1 RC2 available

[bjoern]

On Sat, Aug 24, 2013 at 02:11:45PM +0200, Christian Lohmaier wrote:
> Dear Community,
> 
> The Document Foundation is pleased to announce the second release
> candidate of LibreOffice 4.1.1. The upcoming 4.1.1 will be the first
> in a sequence of frequent bugfix release for our feature-packed 4.1
> line. Please be aware that LibreOffice 4.1.1 RC2 is not been flagged as ready
> for production use yet, you should continue to use LibreOffice 4.1.0 for that.
> 
> The release is available for Windows, Linux and Mac OS X from our QA
> builds download page at
> 
>   http://www.libreoffice.org/download/pre-releases/

And Ubuntu 13.10 (saucy) users find a build in these PPAs:

 https://launchpad.net/~libreoffice/+archive/ppa
 https://launchpad.net/~libreoffice/+archive/libreoffice-4-1

Best,

Bjoern
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/coretext

[Khaled Hosny]

 vcl/coretext/salgdi2.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c2f6428e32227c6f53e618c65a7df3648487df49
Author: Khaled Hosny 
Date:   Tue Aug 27 18:17:09 2013 +0200

Minor

Change-Id: I8a0c09087e522cbd8ee6a25b71541514e562a618

diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index d69c26d..819d9f9 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -354,11 +354,11 @@ static bool AddTempDevFont(const OUString& rFontFileURL)
 OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, 
aUSytemPath ) );
 OString aCFileName = OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 
);
 
-CFStringRef rDir = CFStringCreateWithCString(NULL, aCFileName.getStr(), 
kCFStringEncodingUTF8);
-CFURLRef rDirURL = CFURLCreateWithFileSystemPath(NULL, rDir, 
kCFURLPOSIXPathStyle, true);
+CFStringRef rFontPath = CFStringCreateWithCString(NULL, 
aCFileName.getStr(), kCFStringEncodingUTF8);
+CFURLRef rFontURL = CFURLCreateWithFileSystemPath(NULL, rFontPath, 
kCFURLPOSIXPathStyle, true);
 
 CFErrorRef error;
-bool success = CTFontManagerRegisterFontsForURL(rDirURL, 
kCTFontManagerScopeProcess, &error);
+bool success = CTFontManagerRegisterFontsForURL(rFontURL, 
kCTFontManagerScopeProcess, &error);
 
 if (!success)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Project focused on adding missing functionality to LibreOffice.

[Brennan T Vincent]

I'm curious what budget you came up with. It sounds like a hugely ambitious
project ;)


On Mon, Aug 26, 2013 at 2:18 PM, Jakub Kościelak wrote:

> Dear Developers
>
> I would like to ask if someone would be interested in taking part in a
> project focused on adding missing functionality to LibreOffice.
>
> I wanted to ask if anyone of you have already dealt with, or is in the
> process of work on the following issues.
>
> Any information will be extremely useful:
>
> - Ability to work on documents created in Microsoft Word 2003 or Microsoft
> Word 2007 and 2010, with reliable conversion of all elements and attributes
> of the document - a lot has been done already.
>
> - Recording a narration and adding it to a presentation.
>
> - Creating reports based on external data sources (spreadsheets,
> databases, ODBC-compliant, text files, XML, webservice) - partially
> requirements are met, except for XML and webservice.
>
> - Support for OLAP cubes, performing, editing database and web queries.
> Tools to support statistical, financial, analysis of alternatives and
> solving optimization issues - requirements partly met, there is a solver.
>
> - Maintaining full compatibility with the file formats created in
> Microsoft Excel 2003, 2007 and 2010, including the correct application of
> special functions and macros - a lot has already been done, macros are the
> biggest problem.
>
> - Using mail merge in Draw.
>
> I have gathered, I think, an appropriate budget for this project.
> I'm looking for experienced professionals, and where to find them first if
> not here?
> Thank you in advance for any advice and tips.
>
> All the best,
> Jakub Kościelak
>
> __**_
> 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-commits] core.git: 5 commits - i18nlangtag/source include/i18nlangtag

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx  |   54 
 i18nlangtag/source/isolang/mslangid.cxx |7 
 include/i18nlangtag/mslangid.hxx|6 ++-
 3 files changed, 54 insertions(+), 13 deletions(-)

New commits:
commit 434f3c8e7fac0644cfe1d7a15f97f0c267bac048
Author: Eike Rathke 
Date:   Tue Aug 27 18:08:08 2013 +0200

use ...IgnoreAsciiCase()

Change-Id: I4de5201d6352ef1b7fc0dafcac9f8439dd943b60

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 58ef58e..41d8411 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -773,9 +773,9 @@ void MsLangId::Conversion::convertLanguageToLocaleImpl( 
LanguageType nLang,
 for (const IsoLanguageScriptCountryEntry* pScriptEntry = 
aImplIsoLangScriptEntries;
 pScriptEntry->mnLang != LANGUAGE_DONTKNOW; ++pScriptEntry)
 {
-if (rLocale.Variant.startsWith( pScriptEntry->maLanguageScript))
+if (rLocale.Variant.startsWithIgnoreAsciiCase( 
pScriptEntry->maLanguageScript))
 {
-if (pScriptEntry->getTagString() == rLocale.Variant)
+if (rLocale.Variant.equalsIgnoreAsciiCase( 
pScriptEntry->getTagString()))
 return pScriptEntry->getLocale();
 if (!pFirstScript)
 pFirstScript = pScriptEntry;
@@ -792,8 +792,8 @@ void MsLangId::Conversion::convertLanguageToLocaleImpl( 
LanguageType nLang,
 for (const IsoLanguageScriptCountryEntry* pScriptEntry = 
pFirstScript;
 pScriptEntry->mnLang != LANGUAGE_DONTKNOW; 
++pScriptEntry)
 {
-if (rLocale.Variant.startsWith( 
pScriptEntry->maLanguageScript) &&
-pScriptEntry->maCountry == rLocale.Country)
+if (rLocale.Variant.startsWithIgnoreAsciiCase( 
pScriptEntry->maLanguageScript) &&
+rLocale.Country.equalsIgnoreAsciiCaseAscii( 
pScriptEntry->maCountry))
 return pScriptEntry->getLocale();
 }
 }
@@ -888,9 +888,9 @@ LanguageType 
MsLangId::Conversion::convertLocaleToLanguageImpl(
 for (const IsoLanguageScriptCountryEntry* pScriptEntry = 
aImplIsoLangScriptEntries;
 pScriptEntry->mnLang != LANGUAGE_DONTKNOW; ++pScriptEntry)
 {
-if (rLocale.Variant.startsWith( pScriptEntry->maLanguageScript))
+if (rLocale.Variant.startsWithIgnoreAsciiCase( 
pScriptEntry->maLanguageScript))
 {
-if (pScriptEntry->getTagString() == rLocale.Variant)
+if (rLocale.Variant.equalsIgnoreAsciiCase( 
pScriptEntry->getTagString()))
 return pScriptEntry->mnLang;
 }
 }
commit fbf0a3ee5fec87bff4fd5c373509b287d88a0a31
Author: Eike Rathke 
Date:   Tue Aug 27 17:54:28 2013 +0200

in convertLocaleToLanguageImpl() don't use the implied fall back

... and through of dreaded convertIsoNamesToLanguage()

Change-Id: Ifb86974f9398094ed1a513a060ff61d63f798ea3

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 9722700..58ef58e 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -878,13 +878,39 @@ LanguageType 
MsLangId::Conversion::convertPrivateUseToLanguage( const OUString&
 LanguageType MsLangId::Conversion::convertLocaleToLanguageImpl(
 const ::com::sun::star::lang::Locale& rLocale )
 {
-/* FIXME: this x-... is temporary until conversion will be moved up to
- * LanguageTag. Also handle the nasty "*" joker as privateuse. */
-LanguageType nRet = ((!rLocale.Variant.isEmpty() &&
-(rLocale.Variant.startsWithIgnoreAsciiCase( "x-") || 
(rLocale.Variant == "*"))) ?
-convertPrivateUseToLanguage( rLocale.Variant) :
-convertIsoNamesToLanguage( rLocale.Language, rLocale.Country));
-return nRet;
+if (rLocale.Language == I18NLANGTAG_QLT)
+{
+// "x-..." private use and the nasty "*" joker
+if (rLocale.Variant.startsWithIgnoreAsciiCase( "x-") || 
(rLocale.Variant == "*"))
+return convertPrivateUseToLanguage( rLocale.Variant);
+
+// Search in ISO lll-Ssss-CC
+for (const IsoLanguageScriptCountryEntry* pScriptEntry = 
aImplIsoLangScriptEntries;
+pScriptEntry->mnLang != LANGUAGE_DONTKNOW; ++pScriptEntry)
+{
+if (rLocale.Variant.startsWith( pScriptEntry->maLanguageScript))
+{
+if (pScriptEntry->getTagString() == rLocale.Variant)
+return pScriptEntry->mnLang;
+}
+}
+}
+else
+{
+// language is lower case in table
+OUString aLowerLang = rLocale.Language.toAsciiLowerCase();
+// country is upper case in table
+O

[Libreoffice-commits] core.git: sw/source

[Thorsten Behrens]

 sw/source/core/docnode/ndcopy.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 55c51004c57ed525275cec2f0f28bead55b6e718
Author: Thorsten Behrens 
Date:   Tue Aug 27 18:02:25 2013 +0200

Use slightly less verbose erase-then-move-on idiom.

Change-Id: Iae3a749770b75a99c53755d0410ef9510158e94b

diff --git a/sw/source/core/docnode/ndcopy.cxx 
b/sw/source/core/docnode/ndcopy.cxx
index fe9201b..92c0cec 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -1571,8 +1571,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
 rStartIdx.GetIndex() < pSNd->EndOfSectionIndex() )
 {
 bMakeCpy = false;
-::std::set< _ZSortFly >::const_iterator it_erase=it++;
-aSet.erase (it_erase);
+aSet.erase (it++);
 continue;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sw/source

[Julien Nabet]

 sw/source/core/docnode/ndcopy.cxx |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 2729009dcfa1bc4a4a0f5547fff1b75b5ff9fecb
Author: Julien Nabet 
Date:   Sun Aug 25 22:20:16 2013 +0200

Fix iterator management

Change-Id: Ifb230525d3f5462553a3e78bb4ee740f6a7cc5c2
Reviewed-on: https://gerrit.libreoffice.org/5629
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 
Reviewed-on: https://gerrit.libreoffice.org/5638
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sw/source/core/docnode/ndcopy.cxx 
b/sw/source/core/docnode/ndcopy.cxx
index deefc12..f444c47 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -1469,8 +1469,9 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
 // They are stored as matching the originals, so that we will be later
 // able to build the chains accordingly.
 ::std::vector< SwFrmFmt* > aVecSwFrmFmt;
+::std::set< _ZSortFly >::const_iterator it=aSet.begin();
 
-for (::std::set< _ZSortFly >::const_iterator it=aSet.begin() ; it != 
aSet.end(); ++it )
+while (it != aSet.end())
 {
 // #i59964#
 // correct determination of new anchor position
@@ -1570,7 +1571,9 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
 rStartIdx.GetIndex() < pSNd->EndOfSectionIndex() )
 {
 bMakeCpy = false;
-aSet.erase ( it );
+::std::set< _ZSortFly >::const_iterator it_erase=it++;
+aSet.erase (it_erase);
+continue;
 }
 }
 
@@ -1578,6 +1581,7 @@ void SwDoc::CopyFlyInFlyImpl( const SwNodeRange& rRg,
 if( bMakeCpy )
 aVecSwFrmFmt.push_back( pDest->CopyLayoutFmt( *(*it).GetFmt(),
 aAnchor, false, true ) );
+++it;
 }
 
 // Rebuild as much as possible of all chains that are available in the 
original,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/coretext

[Caolán McNamara]

 vcl/coretext/salgdi2.cxx |   56 +++
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 31fbd9d8b65c7eb9ad618fd68f331a32760c468e
Author: Caolán McNamara 
Date:   Tue Aug 27 16:40:53 2013 +0100

Related: fdo#68192 register bundled fonts

We have to register them one at a time, like windows, this means we detect 
our
bundled opensymbol which makes the "format->bullets and numbering" preview 
work
again.

Doesn't however fix fdo#68192 yet, more magic smoke required.

(cherry picked from commit 8efbafaf8681d39c8c3674368e02ddd572ba5d32)

Conflicts:
vcl/coretext/salgdi2.cxx

Change-Id: I430c91b48d96fb8d62e3b073898b72cf2b8ddea6
Reviewed-on: https://gerrit.libreoffice.org/5647
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index 5cf0f87..ed6dd90 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -346,9 +346,13 @@ sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong, 
ImplKernPairData* )
 
 // ---
 
-static bool AddTempFontDir( const char* pDir )
+static bool AddTempDevFont(const OUString& rFontFileURL)
 {
-CFStringRef rDir = CFStringCreateWithCString(NULL, pDir, 
kCFStringEncodingUTF8);
+OUString aUSytemPath;
+OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, 
aUSytemPath ) );
+OString aCFileName = OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 
);
+
+CFStringRef rDir = CFStringCreateWithCString(NULL, aCFileName.getStr(), 
kCFStringEncodingUTF8);
 CFURLRef rDirURL = CFURLCreateWithFileSystemPath(NULL, rDir, 
kCFURLPOSIXPathStyle, true);
 
 CFErrorRef error;
@@ -363,24 +367,36 @@ static bool AddTempFontDir( const char* pDir )
 return true;
 }
 
-static bool AddLocalTempFontDirs( void )
+static void AddTempFontDir( const OUString &rFontDirUrl )
+{
+osl::Directory aFontDir( rFontDirUrl );
+osl::FileBase::RC rcOSL = aFontDir.open();
+if( rcOSL == osl::FileBase::E_None )
+{
+osl::DirectoryItem aDirItem;
+
+while( aFontDir.getNextItem( aDirItem, 10 ) == osl::FileBase::E_None )
+{
+osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL );
+rcOSL = aDirItem.getFileStatus( aFileStatus );
+if ( rcOSL == osl::FileBase::E_None )
+AddTempDevFont(aFileStatus.getFileURL());
+}
+}
+}
+
+static void AddLocalTempFontDirs()
 {
 static bool bFirst = true;
 if( !bFirst )
-return false;
+return;
 bFirst = false;
 
 // add private font files
 
 OUString aBrandStr( "$BRAND_BASE_DIR" );
 rtl_bootstrap_expandMacros( &aBrandStr.pData );
-OUString aBrandSysPath;
-OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, 
&aBrandSysPath.pData ) == osl_File_E_None );
-
-OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 );
-aBrandFontDir.append( OUStringToOString( aBrandSysPath, 
RTL_TEXTENCODING_UTF8 ) );
-aBrandFontDir.append( "/share/fonts/truetype/" );
-return AddTempFontDir( aBrandFontDir.getStr() );
+AddTempFontDir( aBrandStr + "/share/fonts/truetype/" );
 }
 
 void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
@@ -417,23 +433,7 @@ void AquaSalGraphics::ClearDevFontCache()
 bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
 const OUString& rFontFileURL, const OUString& /*rFontName*/ )
 {
-OUString aUSytemPath;
-OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, 
aUSytemPath ) );
-OString aCFileName = OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 
);
-
-CFStringRef rDir = CFStringCreateWithCString(NULL, aCFileName.getStr(), 
kCFStringEncodingUTF8);
-CFURLRef rDirURL = CFURLCreateWithFileSystemPath(NULL, rDir, 
kCFURLPOSIXPathStyle, true);
-
-CFErrorRef error;
-bool success = CTFontManagerRegisterFontsForURL(rDirURL, 
kCTFontManagerScopeProcess, &error);
-
-if (!success)
-{
-CFRelease(error);
-return false;
-}
-
-return true;
+return ::AddTempDevFont(rFontFileURL);
 }
 
 // ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: eot embedded fonts

[Brennan T Vincent]

Thanks Lubos

I should clarify, I already have an eot->ttf converter working; proof
positive that MS and Monotype's documentation is sufficient :). I just need
to clean up the code, write some unit tests, etc. before I am comfortable
submitting it to LibreOffice.

I'll take a look at EmbeddedFontsHelper


On Tue, Aug 27, 2013 at 8:25 AM, Lubos Lunak  wrote:

> On Tuesday 27 of August 2013, Brennan T Vincent wrote:
> > Hi all,
> >
> > One of the most commonly-occurring problems with .pub import is the fact
> > that we don't respect embedded fonts. Now that LibreOffice supports
> > embedded fonts, it should be possible to make this work.
>
>  That depends. EOT is a Microsoft proprietary font format (which has been
> submitted to W3C, but AFAICT pretty much everybody else ignores it). There
> are tools to convert e.g. TTF fonts to EOT, but I couldn't find absolutely
> anything that'd convert from EOT and the only thing capable of at least
> reading it is MS Windows itself. As far as I understand it, the available
> documentation on it is unsufficient for implementing a reader if you'd
> decide
> it'd be worth the effort (I'm not entirely sure on this part, feel free to
> do
> your own research).
>
>  Here are some links that I found on the topic:
>
> http://blog.yezhucn.com/gdi/t2embed_TTLoadEmbeddedFont.htm
> http://www.pptfaq.com/FAQ00076_Embedding_fonts.htm
>
>
> http://graphicdesign.stackexchange.com/questions/16234/are-there-any-free-tools-to-convert-eot-files-to-ttf-otf-or-any-other-font-f
> http://www.w3.org/Submission/2008/SUBM-EOT-20080305/
> http://www.w3.org/Submission/2008/SUBM-MTX-20080305/
> http://lists.w3.org/Archives/Public/www-style/2008Apr/0227.html
> http://securitylabs.websense.com/content/Blogs/3114.aspx
>
> > A few questions:
> >
> > (1) Do we support Embedded OpenType fonts currently? (.eot)
>
>  No.
>
> > (2) If not (which I suspect), I can contribute some code to do this.
> > Microsoft and Monotype recently granted a perpetual, irrevocable free
> > patent and copyright license to implement the .eot format, so there
> should
> > be no legal issues. I have written a C library to convert from .eot to
> .ttf
> > and would like to know who to talk to in order to get this included in
> > LibreOffice.
>
>  Yes, adding support for export should be fairly easy, given that TTF->EOT
> conversion is possible, but that's the easier part and it doesn't really
> help
> LO much.
>
>  A kind of limited import support should be also doable, as the Windows
> TTLoadEmbeddedFont() function can load such a font for use (unlike the
> normal
> Windows function for opening fonts). See the attached hackish proof of
> concept patch. That'd make import of it Windows-only, unless you find a way
> to use EOT on other platforms. It'd also most probably require some changes
> in VCL's font handling, as I couldn't get the activated font listed among
> available fonts (which is what otherwise the current reading of embedded
> fonts does, it adds the new font temporarily in whichever way the
> underlying
> font system supports and then just uses it normally as if it was a system
> font).
>
>  There's a class EmbeddedFontsHelper in VCL that I created for handling
> embedded fonts, that should be the place to start if you want to give
> implementing this a try.
>
> --
>  Lubos Lunak
>  l.lu...@suse.cz
>
> ___
> 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-commits] core.git: vcl/coretext

[Caolán McNamara]

 vcl/coretext/salgdi2.cxx |   56 +++
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 8efbafaf8681d39c8c3674368e02ddd572ba5d32
Author: Caolán McNamara 
Date:   Tue Aug 27 16:40:53 2013 +0100

Related: fdo#68192 register bundled fonts

We have to register them one at a time, like windows, this means we detect 
our
bundled opensymbol which makes the "format->bullets and numbering" preview 
work
again.

Doesn't however fix fdo#68192 yet, more magic smoke required.

Change-Id: I430c91b48d96fb8d62e3b073898b72cf2b8ddea6

diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx
index 778f042..d69c26d 100644
--- a/vcl/coretext/salgdi2.cxx
+++ b/vcl/coretext/salgdi2.cxx
@@ -348,9 +348,13 @@ sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong, 
ImplKernPairData* )
 
 // ---
 
-static bool AddTempFontDir( const char* pDir )
+static bool AddTempDevFont(const OUString& rFontFileURL)
 {
-CFStringRef rDir = CFStringCreateWithCString(NULL, pDir, 
kCFStringEncodingUTF8);
+OUString aUSytemPath;
+OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, 
aUSytemPath ) );
+OString aCFileName = OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 
);
+
+CFStringRef rDir = CFStringCreateWithCString(NULL, aCFileName.getStr(), 
kCFStringEncodingUTF8);
 CFURLRef rDirURL = CFURLCreateWithFileSystemPath(NULL, rDir, 
kCFURLPOSIXPathStyle, true);
 
 CFErrorRef error;
@@ -365,24 +369,36 @@ static bool AddTempFontDir( const char* pDir )
 return true;
 }
 
-static bool AddLocalTempFontDirs( void )
+static void AddTempFontDir( const OUString &rFontDirUrl )
+{
+osl::Directory aFontDir( rFontDirUrl );
+osl::FileBase::RC rcOSL = aFontDir.open();
+if( rcOSL == osl::FileBase::E_None )
+{
+osl::DirectoryItem aDirItem;
+
+while( aFontDir.getNextItem( aDirItem, 10 ) == osl::FileBase::E_None )
+{
+osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileURL );
+rcOSL = aDirItem.getFileStatus( aFileStatus );
+if ( rcOSL == osl::FileBase::E_None )
+AddTempDevFont(aFileStatus.getFileURL());
+}
+}
+}
+
+static void AddLocalTempFontDirs()
 {
 static bool bFirst = true;
 if( !bFirst )
-return false;
+return;
 bFirst = false;
 
 // add private font files
 
 OUString aBrandStr( "$BRAND_BASE_DIR" );
 rtl_bootstrap_expandMacros( &aBrandStr.pData );
-OUString aBrandSysPath;
-OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, 
&aBrandSysPath.pData ) == osl_File_E_None );
-
-OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 );
-aBrandFontDir.append( OUStringToOString( aBrandSysPath, 
RTL_TEXTENCODING_UTF8 ) );
-aBrandFontDir.append( "/" LIBO_SHARE_FOLDER "/fonts/truetype/" );
-return AddTempFontDir( aBrandFontDir.getStr() );
+AddTempFontDir( aBrandStr + "/" LIBO_SHARE_FOLDER "/fonts/truetype/" );
 }
 
 void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList )
@@ -419,23 +435,7 @@ void AquaSalGraphics::ClearDevFontCache()
 bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
 const OUString& rFontFileURL, const OUString& /*rFontName*/ )
 {
-OUString aUSytemPath;
-OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, 
aUSytemPath ) );
-OString aCFileName = OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 
);
-
-CFStringRef rDir = CFStringCreateWithCString(NULL, aCFileName.getStr(), 
kCFStringEncodingUTF8);
-CFURLRef rDirURL = CFURLCreateWithFileSystemPath(NULL, rDir, 
kCFURLPOSIXPathStyle, true);
-
-CFErrorRef error;
-bool success = CTFontManagerRegisterFontsForURL(rDirURL, 
kCTFontManagerScopeProcess, &error);
-
-if (!success)
-{
-CFRelease(error);
-return false;
-}
-
-return true;
+return ::AddTempDevFont(rFontFileURL);
 }
 
 // ---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: eot embedded fonts

[Lubos Lunak]

On Tuesday 27 of August 2013, Brennan T Vincent wrote:
> Hi all,
>
> One of the most commonly-occurring problems with .pub import is the fact
> that we don't respect embedded fonts. Now that LibreOffice supports
> embedded fonts, it should be possible to make this work.

 That depends. EOT is a Microsoft proprietary font format (which has been 
submitted to W3C, but AFAICT pretty much everybody else ignores it). There 
are tools to convert e.g. TTF fonts to EOT, but I couldn't find absolutely 
anything that'd convert from EOT and the only thing capable of at least 
reading it is MS Windows itself. As far as I understand it, the available 
documentation on it is unsufficient for implementing a reader if you'd decide 
it'd be worth the effort (I'm not entirely sure on this part, feel free to do 
your own research).

 Here are some links that I found on the topic:

http://blog.yezhucn.com/gdi/t2embed_TTLoadEmbeddedFont.htm
http://www.pptfaq.com/FAQ00076_Embedding_fonts.htm

http://graphicdesign.stackexchange.com/questions/16234/are-there-any-free-tools-to-convert-eot-files-to-ttf-otf-or-any-other-font-f
http://www.w3.org/Submission/2008/SUBM-EOT-20080305/
http://www.w3.org/Submission/2008/SUBM-MTX-20080305/
http://lists.w3.org/Archives/Public/www-style/2008Apr/0227.html
http://securitylabs.websense.com/content/Blogs/3114.aspx

> A few questions:
>
> (1) Do we support Embedded OpenType fonts currently? (.eot)

 No.

> (2) If not (which I suspect), I can contribute some code to do this.
> Microsoft and Monotype recently granted a perpetual, irrevocable free
> patent and copyright license to implement the .eot format, so there should
> be no legal issues. I have written a C library to convert from .eot to .ttf
> and would like to know who to talk to in order to get this included in
> LibreOffice.

 Yes, adding support for export should be fairly easy, given that TTF->EOT 
conversion is possible, but that's the easier part and it doesn't really help 
LO much.

 A kind of limited import support should be also doable, as the Windows 
TTLoadEmbeddedFont() function can load such a font for use (unlike the normal 
Windows function for opening fonts). See the attached hackish proof of 
concept patch. That'd make import of it Windows-only, unless you find a way 
to use EOT on other platforms. It'd also most probably require some changes 
in VCL's font handling, as I couldn't get the activated font listed among 
available fonts (which is what otherwise the current reading of embedded 
fonts does, it adds the new font temporarily in whichever way the underlying 
font system supports and then just uses it normally as if it was a system 
font).

 There's a class EmbeddedFontsHelper in VCL that I created for handling 
embedded fonts, that should be the place to start if you want to give 
implementing this a try.

-- 
 Lubos Lunak
 l.lu...@suse.cz
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 8d07153..a4aeb7c 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -312,4 +312,10 @@ $(eval $(call gb_Library_add_generated_exception_objects,oox,\
 CustomTarget/oox/generated/misc/vmlexport-shape-types \
 ))
 
+$(eval $(call gb_Library_use_system_win32_libs,oox,\
+	$(if $(filter $(COM),MSC), \
+		t2embed \
+	) \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index a7e9922..d468d41 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -32,6 +32,13 @@ using namespace oox::core;
 using ::com::sun::star::beans::PropertyValue;
 using ::com::sun::star::lang::XComponent;
 
+#include 
+
+#undef WB_LEFT
+#undef WB_RIGHT
+#include 
+#include 
+
 namespace oox { namespace ppt {
 
 OUString SAL_CALL PowerPointImport_getImplementationName() throw()
@@ -70,8 +77,51 @@ PowerPointImport::~PowerPointImport()
 {
 }
 
+
+FILE* ff;
+unsigned long readfunc( void*, void* out, unsigned long len )
+{
+int r = fread( out, 1, len, ff );
+SAL_DEBUG("RF:" << len << ":" << r );
+return r;
+}
+
+
+void hack()
+{
+EmbeddedFontsHelper::activateFont( "Bauhaus 93", "file://c:/cygwin/home/tinderbox/tmp/font.eof" );
+return;
+
+
+ff = fopen( "c:\\cygwin\\home\\tinderbox\\tmp\\font.eot", "rb" );
+SAL_DEBUG( "F:" << (void*)ff );
+HANDLE ft;
+ULONG status1;
+ULONG status2;
+LONG ret = TTLoadEmbeddedFont(
+&ft,
+0, //TTLOAD_PRIVATE,
+&status1,
+LICENSE_DEFAULT,
+&status2,
+readfunc,
+NULL,
+NULL,
+NULL,
+NULL );
+SAL_DEBUG( "F2:" << ret << ":" << status1 << ":" << status2 );
+fclose( ff );
+wchar_t nm[ LF_FACESIZE + 1 ];
+char nm2[ LF_FACESIZE + 1 ];
+ret = TTGetNewFontName( &ft, nm, sizeof( nm ), nm2, sizeof(nm2));
+SAL_DEBUG("F3:" << ret << ":" << OUString( nm ));
+}
+
+
 bool PowerPointImport::importDocument() throw()
 {
+SAL_DEBUG("HACK");
+hack();
 /*  to activate the PPTX dumper, define the environment

[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann]

 solenv/gbuild/platform/com_MSC_class.mk |2 +-
 solenv/gbuild/platform/mingw.mk |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1b7ac34ea6c1ee8b06ef4cb2ac1791b70189e5cf
Author: Stephan Bergmann 
Date:   Tue Aug 27 17:20:17 2013 +0200

PLAINLIBS_NONE means layer NONE

Change-Id: I69a0f21e73e65747513c478aa6cdd8832d94f9de

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index 6207173..db288d9 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -235,7 +235,7 @@ gb_Library_PLAINEXT := .lib
 
 gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-   $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
+   $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):URELIB) \
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index d93fcce..f2d5f84 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -186,7 +186,7 @@ gb_Library_UNOVERDLLEXT := 
$(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT)
 
 gb_Library_LAYER := \
$(foreach lib,$(gb_Library_OOOLIBS),$(lib):OOO) \
-   $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):OOO) \
+   $(foreach lib,$(gb_Library_PLAINLIBS_NONE),$(lib):NONE) \
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):URELIB) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):OOO) \
$(foreach lib,$(gb_Library_PRIVATELIBS_URE),$(lib):URELIB) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Pierre-Eric Pelloux-Prayer]

 sc/source/core/tool/interpr1.cxx |   36 +---
 1 file changed, 25 insertions(+), 11 deletions(-)

New commits:
commit 3fed166279377f7ad702b8911899243b8adff3bf
Author: Pierre-Eric Pelloux-Prayer 
Date:   Fri Aug 16 16:29:38 2013 +0200

interpr/vlookup: use ScMatrix func to find matching cells

Moves the cpu intensive code to ScMatrix, where we can use our
knowledge of the internal structure: use mdds::multi_type_matrix::walk
instead of browsing cells one by one.

Change-Id: Ie1df20e2be6414b8e21b4d58b7697a0801222c1e
Reviewed-on: https://gerrit.libreoffice.org/5455
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 5043272..ba26581 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -6565,18 +6565,25 @@ void ScInterpreter::CalculateLookup(bool HLookup)
 }
 else
 {
-for (SCSIZE i = 0; i < nMatCount; i++)
+if (HLookup)
 {
-if (HLookup ? pMat->IsString(i, 0) : 
pMat->IsString(0, i))
+for (SCSIZE i = 0; i < nMatCount; i++)
 {
-if ( ScGlobal::GetpTransliteration()->isEqual(
-HLookup ? pMat->GetString(i,0) : 
pMat->GetString(0,i), rParamStr))
+if (pMat->IsString(i, 0))
 {
-nDelta = i;
-i = nMatCount + 1;
+if ( 
ScGlobal::GetpTransliteration()->isEqual(
+pMat->GetString(i,0), rParamStr))
+{
+nDelta = i;
+i = nMatCount + 1;
+}
 }
 }
 }
+else
+{
+nDelta = pMat->MatchStringInColumns(rParamStr, 0, 
0);
+}
 }
 }
 else
@@ -6597,17 +6604,24 @@ void ScInterpreter::CalculateLookup(bool HLookup)
 }
 else
 {
-for (SCSIZE i = 0; i < nMatCount; i++)
+if (HLookup)
 {
-if (!(HLookup ? pMat->IsString(i, 0) : 
pMat->IsString(0, i)))
+for (SCSIZE i = 0; i < nMatCount; i++)
 {
-if ((HLookup ? pMat->GetDouble(i,0) : 
pMat->GetDouble(0,i)) == rItem.mfVal)
+if (! pMat->IsString(i, 0) )
 {
-nDelta = i;
-i = nMatCount + 1;
+if ( pMat->GetDouble(i,0) == rItem.mfVal)
+{
+nDelta = i;
+i = nMatCount + 1;
+}
 }
 }
 }
+else
+{
+nDelta = pMat->MatchDoubleInColumns(rItem.mfVal, 
0, 0);
+}
 }
 }
 if ( nDelta != SCSIZE_MAX )
___
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

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Bug 60270 depends on bug 67743, which changed state.

Bug 67743 Summary: can't save new autocorrect entries or delete existing ones
https://bugs.freedesktop.org/show_bug.cgi?id=67743

   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

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Thomas van der Meulen  changed:

   What|Removed |Added

 Depends on||68607

--- Comment #169 from Thomas van der Meulen  ---
added bug 68607 " FILEOPEN: 8 page word document only displays page one" 
It is a regression since 4.0.x and only opens 1 of the 8 pages.

-- 
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: sc/source

[Kohei Yoshida]

 sc/source/core/tool/scmatrix.cxx |   40 +++
 1 file changed, 24 insertions(+), 16 deletions(-)

New commits:
commit 805e43c8c7d10568186cf218f8c1baf39691e3b1
Author: Kohei Yoshida 
Date:   Tue Aug 27 10:35:36 2013 -0400

Follow-up change for coding styles, boundary checks etc.

Change-Id: Ice87da75429c54987f78c2897e6f4ded28cd8614

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 9fc..2640bfb 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -32,6 +32,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include 
@@ -942,11 +943,12 @@ public:
 }
 };
 
+const size_t ResultNotSet = std::numeric_limits::max();
 
-template
+template
 class WalkAndMatchElements : 
std::unary_function
 {
-vType maMatchValue;
+_Type maMatchValue;
 MatrixImplType::size_pair_type maSize;
 size_t mnCol1;
 size_t mnCol2;
@@ -954,8 +956,13 @@ class WalkAndMatchElements : 
std::unary_function= ( mnCol1 * maSize.row ) &&
-mnIndex <= ( ( mnCol2 + 1 ) * maSize.row ) )
+if ((mnCol1 * maSize.row) <= mnIndex && mnIndex < ((mnCol2 + 1) * 
maSize.row))
 {
 mnResult = compare(node);
 }
@@ -979,14 +985,15 @@ public:
 };
 
 template<>
-size_t WalkAndMatchElements::compare(const 
MatrixImplType::element_block_node_type& node) const {
+size_t WalkAndMatchElements::compare(const 
MatrixImplType::element_block_node_type& node) const
+{
 size_t nCount = 0;
 switch (node.type)
 {
 case mdds::mtm::element_numeric:
 {
-mdds::mtv::numeric_element_block::const_iterator it = 
mdds::mtv::numeric_element_block::begin(*node.data);
-mdds::mtv::numeric_element_block::const_iterator itEnd = 
mdds::mtv::numeric_element_block::end(*node.data);
+MatrixImplType::numeric_block_type::const_iterator it = 
MatrixImplType::numeric_block_type::begin(*node.data);
+MatrixImplType::numeric_block_type::const_iterator itEnd = 
MatrixImplType::numeric_block_type::end(*node.data);
 for (; it != itEnd; ++it, nCount++)
 {
 if (*it == maMatchValue)
@@ -998,9 +1005,9 @@ size_t WalkAndMatchElements::compare(const 
MatrixImplType::element_block
 }
 case mdds::mtm::element_boolean:
 {
-mdds::mtv::boolean_element_block::const_iterator it = 
mdds::mtv::boolean_element_block::begin(*node.data);
-mdds::mtv::boolean_element_block::const_iterator itEnd = 
mdds::mtv::boolean_element_block::end(*node.data);
-for (; it != itEnd; ++it, nCount++)
+MatrixImplType::boolean_block_type::const_iterator it = 
MatrixImplType::boolean_block_type::begin(*node.data);
+MatrixImplType::boolean_block_type::const_iterator itEnd = 
MatrixImplType::boolean_block_type::end(*node.data);
+for (; it != itEnd; ++it, ++nCount)
 {
 if (*it == maMatchValue)
 {
@@ -1015,11 +1022,12 @@ size_t WalkAndMatchElements::compare(const 
MatrixImplType::element_block
 default:
 ;
 }
-return SCSIZE_MAX;
+return ResultNotSet;
 }
 
 template<>
-size_t WalkAndMatchElements::compare(const 
MatrixImplType::element_block_node_type& node) const {
+size_t WalkAndMatchElements::compare(const 
MatrixImplType::element_block_node_type& node) const
+{
 size_t nCount = 0;
 switch (node.type)
 {
@@ -1042,7 +1050,7 @@ size_t WalkAndMatchElements::compare(const 
MatrixImplType::element_blo
 default:
 ;
 }
-return SCSIZE_MAX;
+return ResultNotSet;
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - i18nlangtag/source

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |  247 -
 1 file changed, 155 insertions(+), 92 deletions(-)

New commits:
commit 78e2309c0fb21d77b64f37b3269d0d53e6fa7d1b
Author: Eike Rathke 
Date:   Tue Aug 27 16:24:02 2013 +0200

use IsoLanguageScriptCountryEntry in convertLanguageToLocaleImpl()

... and lookupFallbackLocale()

Change-Id: I736ee24801b825c916edba25e1b43bbcbc3f1506

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 6d66eb2..db13298 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -712,7 +712,18 @@ static IsoLangOtherEntry const aImplPrivateUseEntries[] =
 void MsLangId::Conversion::convertLanguageToLocaleImpl( LanguageType nLang,
 ::com::sun::star::lang::Locale & rLocale )
 {
-// Search for LangID (in this table we find only defined ISO combinations)
+// Search for LangID in ISO lll-Ssss-CC
+for (const IsoLanguageScriptCountryEntry* pScriptEntry = 
aImplIsoLangScriptEntries;
+pScriptEntry->mnLang != LANGUAGE_DONTKNOW; ++pScriptEntry)
+{
+if ( pScriptEntry->mnLang == nLang )
+{
+rLocale = pScriptEntry->getLocale();
+return;
+}
+}
+
+// Search for LangID in ISO lll-CC
 for (const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries;
 pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry)
 {
@@ -753,6 +764,50 @@ void MsLangId::Conversion::convertLanguageToLocaleImpl( 
LanguageType nLang,
 OUString aUpperCountry = rLocale.Country.toAsciiUpperCase();
 sal_Int32 nCountryLen = aUpperCountry.getLength();
 
+if (!rLocale.Variant.isEmpty())
+{
+// Search in ISO lll-Ssss-CC
+const IsoLanguageScriptCountryEntry* pFirstScript = NULL;
+for (const IsoLanguageScriptCountryEntry* pScriptEntry = 
aImplIsoLangScriptEntries;
+pScriptEntry->mnLang != LANGUAGE_DONTKNOW; ++pScriptEntry)
+{
+if (rLocale.Variant.startsWith( pScriptEntry->maLanguageScript))
+{
+if (pScriptEntry->getTagString() == rLocale.Variant)
+return pScriptEntry->getLocale();
+if (!pFirstScript)
+pFirstScript = pScriptEntry;
+}
+}
+// If at least a lll-Ssss matched, try that with country or use it as
+// fallback.
+if (pFirstScript)
+{
+// Check for country only if there is more than lll-Ssss-CC in tag
+// string, else we would had matched it already.
+if (!rLocale.Country.isEmpty() && rLocale.Variant.getLength() > 11)
+{
+for (const IsoLanguageScriptCountryEntry* pScriptEntry = 
pFirstScript;
+pScriptEntry->mnLang != LANGUAGE_DONTKNOW; 
++pScriptEntry)
+{
+if (rLocale.Variant.startsWith( 
pScriptEntry->maLanguageScript) &&
+pScriptEntry->maCountry == rLocale.Country)
+return pScriptEntry->getLocale();
+}
+}
+return pFirstScript->getLocale();
+}
+// Extract language from tag string, country is used as present in
+// Locale because in the tables that follow we have only ISO 3166
+// countries and if that is in the tag string we also have it in the
+// Locale.
+sal_Int32 nIndex = 0;
+aLowerLang = rLocale.Variant.getToken( 0, '-', 
nIndex).toAsciiLowerCase();
+// Cater for "x-..."
+if (aLowerLang.getLength() == 1 && aLowerLang[0] == 'x' && nIndex > 0)
+aLowerLang += "-" + rLocale.Variant.getToken( 0, '-', 
nIndex).toAsciiLowerCase();
+}
+
 // Search for locale and remember first lang-only.
 const IsoLanguageCountryEntry* pFirstLang = NULL;
 const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries;
commit 3b408e0e3623643f2ea605c28645fd2e51abaa6c
Author: Eike Rathke 
Date:   Tue Aug 27 14:50:00 2013 +0200

changed do{}while() to for(){}

Change-Id: I2c3962cdc3ad956333a37f73785928d5f1e94154

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 3a1a139..6d66eb2 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -713,8 +713,8 @@ void MsLangId::Conversion::convertLanguageToLocaleImpl( 
LanguageType nLang,
 ::com::sun::star::lang::Locale & rLocale )
 {
 // Search for LangID (in this table we find only defined ISO combinations)
-const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries;
-do
+for (const IsoLanguageCountryEntry* pEntry = aImplIsoLangEntries;
+pEntry->mnLang != LANGUAGE_DONTKNOW; ++pEntry)
 {
 if ( pEntry->mnLang == nLang )
 {
@@ -723,13 +723,11 @@ void MsLangId::Conversion::convertLanguageToLocaleImpl( 
Languag

[Libreoffice-commits] core.git: sc/source

[Kohei Yoshida]

 sc/source/core/tool/scmatrix.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b07708dd46443218919ae8d6c0abe421f75a82f8
Author: Kohei Yoshida 
Date:   Tue Aug 27 10:23:05 2013 -0400

Fix the build.

Change-Id: I4d259c7bb8c043889ea23ae9056e2eb8a63d98c3

diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 3bf042b..9fc 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -948,12 +948,14 @@ class WalkAndMatchElements : 
std::unary_functionhttp://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: formula/source: get rid of unnecessary warning

[Eike Rathke]

Hi Winfried,

On Tuesday, 2013-08-27 06:48:28 -0700, Winfried Donkers wrote:

> commit e5321437322fd812b93fee266af309e782479488
> Author: Winfried Donkers 
> Date:   Thu Aug 22 17:03:58 2013 +0200
> 
> get rid of unnecessary warning
> 
> A value of 0 for Opcode eOp produces a debug assertion that is
> not in place as opcode with value does exist (ocPush, SC_OPCODE_PUSH).
> 
> --- a/formula/source/core/api/FormulaCompiler.cxx
> +++ b/formula/source/core/api/FormulaCompiler.cxx
> @@ -488,8 +488,8 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > 
> FormulaCompiler::OpCodeMap::create
>  
>  void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const 
> OpCode eOp )
>  {
> -DBG_ASSERT( 0 < eOp && sal_uInt16(eOp) < mnSymbols, 
> "OpCodeMap::putOpCode: OpCode out of range");
> -if (0 < eOp && sal_uInt16(eOp) < mnSymbols)
> +DBG_ASSERT( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode 
> out of range");
> +if (sal_uInt16(eOp) < mnSymbols)
>  {

When did you encounter that warning?
Putting ocPush into an OpCodeMap probably indicates an error, as ocPush
is not an operator or function that maps to any string. An ocPush is
always used with a cell reference, fixed value or function result.
Unless there is a compelling reason for this change I suggest to revert it.

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
For key transition see http://erack.de/key-transition-2013-01-10.txt.asc
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack


pgpIlIiXn9Qw7.pgp
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sc/inc sc/source

[Pierre-Eric Pelloux-Prayer]

 sc/inc/scmatrix.hxx  |2 
 sc/source/core/tool/scmatrix.cxx |  126 +++
 2 files changed, 128 insertions(+)

New commits:
commit 7334f8db6f6004d48e2dbf014f27878a7ae21eb1
Author: Pierre-Eric Pelloux-Prayer 
Date:   Fri Aug 16 16:29:27 2013 +0200

matrix: add functions to lookup a double or string in columns

Allows efficient lookup, instead of doing per cell fetch + match.

Change-Id: I3cd0d26a8fc91ed38fd339229fc0e948fb849f5e
Reviewed-on: https://gerrit.libreoffice.org/5454
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 4057cc4..2ef596b 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -334,6 +334,8 @@ public:
 IterateResult SumSquare(bool bTextAsZero) const;
 IterateResult Product(bool bTextAsZero) const;
 size_t Count(bool bCountStrings) const;
+size_t MatchDoubleInColumns(double fValue, size_t nCol1, size_t nCol2) 
const;
+size_t MatchStringInColumns(const OUString& rStr, size_t nCol1, size_t 
nCol2) const;
 
 double GetMaxValue( bool bTextAsZero ) const;
 double GetMinValue( bool bTextAsZero ) const;
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 73ed2e2..3bf042b 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -222,6 +222,8 @@ public:
 ScMatrix::IterateResult SumSquare(bool bTextAsZero) const;
 ScMatrix::IterateResult Product(bool bTextAsZero) const;
 size_t Count(bool bCountStrings) const;
+size_t MatchDoubleInColumns(double fValue, size_t nCol1, size_t nCol2) 
const;
+size_t MatchStringInColumns(const OUString& rStr, size_t nCol1, size_t 
nCol2) const;
 
 double GetMaxValue( bool bTextAsZero ) const;
 double GetMinValue( bool bTextAsZero ) const;
@@ -940,6 +942,108 @@ public:
 }
 };
 
+
+template
+class WalkAndMatchElements : 
std::unary_function
+{
+vType maMatchValue;
+MatrixImplType::size_pair_type maSize;
+size_t mnCol1, mnCol2;
+size_t mnResult, mnIndex;
+
+public:
+WalkAndMatchElements(vType aMatchValue, const 
MatrixImplType::size_pair_type& aSize, size_t nCol1, size_t nCol2)
+: maMatchValue(aMatchValue), maSize(aSize), mnCol1(nCol1), 
mnCol2(nCol2), mnResult(size_t_MAX), mnIndex(0) {}
+
+size_t getMatching() const { return mnResult; }
+
+size_t compare(const MatrixImplType::element_block_node_type& node) const;
+
+void operator() (const MatrixImplType::element_block_node_type& node)
+{
+// early exit if match aleady found
+if (mnResult != SCSIZE_MAX)
+return;
+
+// limit lookup to the requested columns
+if (mnIndex >= ( mnCol1 * maSize.row ) &&
+mnIndex <= ( ( mnCol2 + 1 ) * maSize.row ) )
+{
+mnResult = compare(node);
+}
+
+mnIndex += node.size;
+}
+};
+
+template<>
+size_t WalkAndMatchElements::compare(const 
MatrixImplType::element_block_node_type& node) const {
+size_t nCount = 0;
+switch (node.type)
+{
+case mdds::mtm::element_numeric:
+{
+mdds::mtv::numeric_element_block::const_iterator it = 
mdds::mtv::numeric_element_block::begin(*node.data);
+mdds::mtv::numeric_element_block::const_iterator itEnd = 
mdds::mtv::numeric_element_block::end(*node.data);
+for (; it != itEnd; ++it, nCount++)
+{
+if (*it == maMatchValue)
+{
+return mnIndex + nCount;
+}
+}
+break;
+}
+case mdds::mtm::element_boolean:
+{
+mdds::mtv::boolean_element_block::const_iterator it = 
mdds::mtv::boolean_element_block::begin(*node.data);
+mdds::mtv::boolean_element_block::const_iterator itEnd = 
mdds::mtv::boolean_element_block::end(*node.data);
+for (; it != itEnd; ++it, nCount++)
+{
+if (*it == maMatchValue)
+{
+return mnIndex + nCount;
+}
+}
+break;
+}
+break;
+case mdds::mtm::element_string:
+case mdds::mtm::element_empty:
+default:
+;
+}
+return SCSIZE_MAX;
+}
+
+template<>
+size_t WalkAndMatchElements::compare(const 
MatrixImplType::element_block_node_type& node) const {
+size_t nCount = 0;
+switch (node.type)
+{
+case mdds::mtm::element_string:
+{
+MatrixImplType::string_block_type::const_iterator it = 
MatrixImplType::string_block_type::begin(*node.data);
+MatrixImplType::string_block_type::const_iterator itEnd = 
MatrixImplType::string_block_type::end(*node.data);
+for (; it != itEnd; ++it, ++nCount)
+{
+if (ScGlobal::GetpTransliteration()->isEqual(*it, 
maMatchValue))
+{
+

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/inc vcl/source

[Armin Le Grand]

 vcl/inc/vcl/bitmapex.hxx|   23 +
 vcl/inc/vcl/bmpacc.hxx  |   10 ++
 vcl/source/gdi/bitmapex.cxx |  176 
 vcl/source/gdi/bmpacc.cxx   |  120 ++
 vcl/source/gdi/outdev2.cxx  |  125 ---
 5 files changed, 313 insertions(+), 141 deletions(-)

New commits:
commit 75e9010730525ed6122655ac3c3899359c305104
Author: Armin Le Grand 
Date:   Tue Aug 27 12:46:41 2013 +

i122778 Enhanced own transformer for drawing transformed bitmaps which is 
used in the cases where no fallback for direct system support is there (Linux)

diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx
index a7663bd..cfc7a8f 100644
--- a/vcl/inc/vcl/bitmapex.hxx
+++ b/vcl/inc/vcl/bitmapex.hxx
@@ -393,25 +393,42 @@ public:
 @param rTransformation
 The back transformation for each pixel in (0 .. fWidth),(0 .. fHeight) 
to
 local pixel coordiantes
+
+@param bSmooth
+Defines if pixel interpolation is to be used to create the result
 */
 BitmapEx TransformBitmapEx(
 double fWidth,
 double fHeight,
-const basegfx::B2DHomMatrix& rTransformation) const;
+const basegfx::B2DHomMatrix& rTransformation,
+bool bSmooth = true) const;
 
 /** Create transformed Bitmap
 
 @param rTransformation
-The transformation from unit coordinates to target
+The transformation from unit coordinates to the unit range
+
+@param rVisibleRange
+The relative visible range in unit coordinates, relative to (0,0,1,1) 
which
+defines the whole target area
 
 @param fMaximumArea
 A limitation for the maximum size of pixels to use for the result
 
+@param bSmooth
+Defines if pixel interpolation is to be used to create the result
+
+The traget size of the result bitmap is defined by transforming the 
given
+rTargetRange with the given rTransformation; the area of the result is
+linearly scaled to not exceed the given fMaximumArea
+
 @return The transformed bitmap
 */
 BitmapEx getTransformed(
 const basegfx::B2DHomMatrix& rTransformation,
-double fMaximumArea = 50.0) const;
+const basegfx::B2DRange& rVisibleRange,
+double fMaximumArea = 50.0,
+bool bSmooth = true) const;
 
 /** Create ColorStack-modified version of this BitmapEx
 
diff --git a/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx
index c22e865..2a51304 100644
--- a/vcl/inc/vcl/bmpacc.hxx
+++ b/vcl/inc/vcl/bmpacc.hxx
@@ -171,6 +171,16 @@ public:
 inline BitmapColor  GetColor( long nY, long nX ) const;
 inline sal_uInt8GetPixelIndex( long nY, long nX ) const;
 inline sal_uInt8GetLuminance( long nY, long nX ) const;
+
+/** Get the interpolated color at coordinates fY, fX; if outside, return 
rFallback */
+BitmapColor GetInterpolatedColorWithFallback( double fY, double fX, const 
BitmapColor& rFallback ) const;
+
+/** Get the color at coordinates fY, fX; if outside, return rFallback. 
Automatically does the correct
+inside/outside checks, e.g. static_cast< sal_uInt32 >(-0.25) *is* 0, 
not -1 and has to be outside */
+BitmapColor GetColorWithFallback( double fY, double fX, const BitmapColor& 
rFallback ) const;
+
+/** Get the color at coordinates nY, nX; if outside, return rFallback */
+BitmapColor GetColorWithFallback( long nY, long nX, const BitmapColor& 
rFallback ) const;
 };
 
 // -
diff --git a/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 6925142..5e34624b 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.cxx
@@ -837,87 +837,6 @@ sal_uInt8 BitmapEx::GetTransparency(sal_Int32 nX, 
sal_Int32 nY) const
 
 namespace
 {
-void impSmoothPoint(BitmapColor& rValue, const basegfx::B2DPoint& rSource, 
sal_Int32 nIntX, sal_Int32 nIntY, BitmapReadAccess& rRead)
-{
-double fDeltaX(rSource.getX() - nIntX);
-double fDeltaY(rSource.getY() - nIntY);
-sal_Int32 nIndX(0L);
-sal_Int32 nIndY(0L);
-
-if(fDeltaX > 0.0 && nIntX + 1L < rRead.Width())
-{
-nIndX++;
-}
-else if(fDeltaX < 0.0 && nIntX >= 1L)
-{
-fDeltaX = -fDeltaX;
-nIndX--;
-}
-
-if(fDeltaY > 0.0 && nIntY + 1L < rRead.Height())
-{
-nIndY++;
-}
-else if(fDeltaY < 0.0 && nIntY >= 1L)
-{
-fDeltaY = -fDeltaY;
-nIndY--;
-}
-
-if(nIndX || nIndY)
-{
-const double fColorToReal(1.0 / 255.0);
-double fR(rValue.GetRed() * fColorToReal);
-double fG(rValue.GetGreen() * fColorToReal);
-double fB(rValue.GetBlue() * fColorToReal);
-double fRBottom(0.0), fGBottom(0.0), fBBottom(0.0);
-
-if(n

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - editeng/source include/unotools sfx2/source unotools/source

[Caolán McNamara]

 editeng/source/misc/acorrcfg.cxx|   15 +--
 include/unotools/ucbhelper.hxx  |   18 +++---
 sfx2/source/doc/docfile.cxx |   23 ++-
 unotools/source/ucbhelper/ucbhelper.cxx |   20 
 4 files changed, 50 insertions(+), 26 deletions(-)

New commits:
commit ef0a7a309d03c83f59a32595132f3f3e4c9893c0
Author: Caolán McNamara 
Date:   Tue Aug 27 14:35:18 2013 +0100

Resolves: fdo#67743 ensure user autocorr config dir exists

We try and copy the shared one to the user location the first time we 
create a
customized user file. If the dir doesn't exist then that migration doesn't
happen. The new autocorr file is then written, creating the dir, and any
further operations will reattempt the skipped share copy, and this time 
succeed
because the dir now exists.  Which overwrites the previously written 
customized
content.

This is similar to fdo#65501 "ensure configured backup dir exists before 
using
it", so reuse that code and move it into unotools.

Change-Id: I38fa621b8d7295d70b09172a028569ea95404120
(cherry picked from commit 68dea1c1b61a99cdef556ba7d8ccfdad1be8a663)
Reviewed-on: https://gerrit.libreoffice.org/5645
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 04a9bdf..af4d5bd 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -17,11 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 
 #include 
@@ -31,6 +33,7 @@
 #include 
 
 using namespace utl;
+using namespace com::sun::star;
 using namespace com::sun::star::uno;
 
 
@@ -47,10 +50,18 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() :
 SvtPathOptions aPathOpt;
 String sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() );
 
+sSharePath = sAutoPath.GetToken(0, ';');
+sUserPath = sAutoPath.GetToken(1, ';');
+
+//fdo#67743 ensure the userdir exists so that any later attempt to copy the
+//shared autocorrect file into the user dir will succeed
+::ucbhelper::Content aContent;
+Reference < ucb::XCommandEnvironment > xEnv;
+
::utl::UCBContentHelper::ensureFolder(comphelper::getProcessComponentContext(), 
xEnv, sUserPath, aContent);
+
 String* pS = &sSharePath;
 for( sal_uInt16 n = 0; n < 2; ++n, pS = &sUserPath )
 {
-*pS = sAutoPath.GetToken( n, ';' );
 INetURLObject aPath( *pS );
 aPath.insertName(OUString("acor"));
 *pS = aPath.GetMainURL(INetURLObject::DECODE_TO_IURI);
diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx
index fad06ce..fe29a3a 100644
--- a/include/unotools/ucbhelper.hxx
+++ b/include/unotools/ucbhelper.hxx
@@ -26,9 +26,15 @@
 #include "sal/types.h"
 #include "unotools/unotoolsdllapi.h"
 
-namespace com { namespace sun { namespace star { namespace uno {
-class Any;
-} } } }
+namespace com { namespace sun { namespace star {
+namespace uno {
+class Any;
+class XComponentContext;
+}
+namespace ucb{
+class XCommandEnvironment;
+}
+} } }
 namespace ucbhelper { class Content; }
 
 namespace utl { namespace UCBContentHelper {
@@ -53,6 +59,12 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder(
 ucbhelper::Content & parent, OUString const & title,
 ucbhelper::Content & result, bool exclusive = false);
 
+/// like mkdir -p
+UNOTOOLS_DLLPUBLIC bool ensureFolder(
+com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > 
xCtx,
+com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > 
xEnv,
+const OUString& rFolder, ucbhelper::Content & result);
+
 /// @return the value of the "Size" property of the given content, or zero if
 /// obtaining the property yields a void value or raises a
 /// non-RuntimeException (RuntimeExceptions are passed through)
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 25b7f27..c1ad603 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2126,25 +2126,6 @@ void SfxMedium::DoInternalBackup_Impl( const 
::ucbhelper::Content& aOriginalCont
 aTransactTemp.EnableKillingFile( true );
 }
 
-bool ensureFolder(
-uno::Reference< uno::XComponentContext > xCtx,
-uno::Reference< ucb::XCommandEnvironment > xEnv,
-const OUString& rFolder, ucbhelper::Content & result)
-{
-INetURLObject aURL( rFolder );
-OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, 
INetURLObject::DECODE_WITH_CHARSET );
-aURL.removeSegment();
-::ucbhelper::Content aParent;
-
-if ( ::ucbhelper::Content::create( aURL.GetMainURL( 
INetURLObject::NO_DECODE ),
-  xEnv, xCtx, aParent ) )
-{
-return ::utl::UCBContentHelper::MakeFolder

[Libreoffice-commits] core.git: formula/source

[Winfried Donkers]

 formula/source/core/api/FormulaCompiler.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e5321437322fd812b93fee266af309e782479488
Author: Winfried Donkers 
Date:   Thu Aug 22 17:03:58 2013 +0200

get rid of unnecessary warning

A value of 0 for Opcode eOp produces a debug assertion that is
not in place as opcode with value does exist (ocPush, SC_OPCODE_PUSH).

Change-Id: If529cc2ecd8d4d3a5e31f084dfa72e13c9c0fe37
Reviewed-on: https://gerrit.libreoffice.org/5586
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/formula/source/core/api/FormulaCompiler.cxx 
b/formula/source/core/api/FormulaCompiler.cxx
index 4cb1164..d9861cf 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -488,8 +488,8 @@ uno::Sequence< sheet::FormulaOpCodeMapEntry > 
FormulaCompiler::OpCodeMap::create
 
 void FormulaCompiler::OpCodeMap::putOpCode( const String & rStr, const OpCode 
eOp )
 {
-DBG_ASSERT( 0 < eOp && sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: 
OpCode out of range");
-if (0 < eOp && sal_uInt16(eOp) < mnSymbols)
+DBG_ASSERT( sal_uInt16(eOp) < mnSymbols, "OpCodeMap::putOpCode: OpCode out 
of range");
+if (sal_uInt16(eOp) < mnSymbols)
 {
 DBG_ASSERT( (mpTable[eOp].Len() == 0) || (mpTable[eOp] == rStr) ||
 (eOp == ocCurrency) || (eOp == ocSep) || (eOp == ocArrayColSep) ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Smart-Art in Writer - Correct 'Import' approach ?

[Thorsten Behrens]

Adam Fyne wrote:
> Meaning – if the user does WordèLOèWord round-trip we plan that they
> won't lose their Smart-Art object.
> 
Hi Adam,

sounds lovely -

> In order to preserve the original Smart-Art object – we would plan
> on loading the entire XML nodes and attributes of Smart-Art to
> property maps (e.g. Miklos's great 'InteropGrabBag').
> 
I would probably try & preserve the */diagrams/*.xml files
verbatim. com::sun::star::xml::dom::* has functionality to stream that
in and out of memory, there is some initial code doing that for PPTX
in oox/source/ppt/dgmlayout.cxx.

HTH,

-- Thorsten


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: editeng/source include/unotools sfx2/source unotools/source

[Caolán McNamara]

 editeng/source/misc/acorrcfg.cxx|   15 +--
 include/unotools/ucbhelper.hxx  |   18 +++---
 sfx2/source/doc/docfile.cxx |   23 ++-
 unotools/source/ucbhelper/ucbhelper.cxx |   20 
 4 files changed, 50 insertions(+), 26 deletions(-)

New commits:
commit 68dea1c1b61a99cdef556ba7d8ccfdad1be8a663
Author: Caolán McNamara 
Date:   Tue Aug 27 14:35:18 2013 +0100

Resolves: fdo#67743 ensure user autocorr config dir exists

We try and copy the shared one to the user location the first time we 
create a
customized user file. If the dir doesn't exist then that migration doesn't
happen. The new autocorr file is then written, creating the dir, and any
further operations will reattempt the skipped share copy, and this time 
succeed
because the dir now exists.  Which overwrites the previously written 
customized
content.

This is similar to fdo#65501 "ensure configured backup dir exists before 
using
it", so reuse that code and move it into unotools.

Change-Id: I38fa621b8d7295d70b09172a028569ea95404120

diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 04a9bdf..af4d5bd 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -17,11 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
+#include 
 #include 
 
 #include 
@@ -31,6 +33,7 @@
 #include 
 
 using namespace utl;
+using namespace com::sun::star;
 using namespace com::sun::star::uno;
 
 
@@ -47,10 +50,18 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() :
 SvtPathOptions aPathOpt;
 String sSharePath, sUserPath, sAutoPath( aPathOpt.GetAutoCorrectPath() );
 
+sSharePath = sAutoPath.GetToken(0, ';');
+sUserPath = sAutoPath.GetToken(1, ';');
+
+//fdo#67743 ensure the userdir exists so that any later attempt to copy the
+//shared autocorrect file into the user dir will succeed
+::ucbhelper::Content aContent;
+Reference < ucb::XCommandEnvironment > xEnv;
+
::utl::UCBContentHelper::ensureFolder(comphelper::getProcessComponentContext(), 
xEnv, sUserPath, aContent);
+
 String* pS = &sSharePath;
 for( sal_uInt16 n = 0; n < 2; ++n, pS = &sUserPath )
 {
-*pS = sAutoPath.GetToken( n, ';' );
 INetURLObject aPath( *pS );
 aPath.insertName(OUString("acor"));
 *pS = aPath.GetMainURL(INetURLObject::DECODE_TO_IURI);
diff --git a/include/unotools/ucbhelper.hxx b/include/unotools/ucbhelper.hxx
index fad06ce..fe29a3a 100644
--- a/include/unotools/ucbhelper.hxx
+++ b/include/unotools/ucbhelper.hxx
@@ -26,9 +26,15 @@
 #include "sal/types.h"
 #include "unotools/unotoolsdllapi.h"
 
-namespace com { namespace sun { namespace star { namespace uno {
-class Any;
-} } } }
+namespace com { namespace sun { namespace star {
+namespace uno {
+class Any;
+class XComponentContext;
+}
+namespace ucb{
+class XCommandEnvironment;
+}
+} } }
 namespace ucbhelper { class Content; }
 
 namespace utl { namespace UCBContentHelper {
@@ -53,6 +59,12 @@ UNOTOOLS_DLLPUBLIC bool MakeFolder(
 ucbhelper::Content & parent, OUString const & title,
 ucbhelper::Content & result, bool exclusive = false);
 
+/// like mkdir -p
+UNOTOOLS_DLLPUBLIC bool ensureFolder(
+com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > 
xCtx,
+com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > 
xEnv,
+const OUString& rFolder, ucbhelper::Content & result);
+
 /// @return the value of the "Size" property of the given content, or zero if
 /// obtaining the property yields a void value or raises a
 /// non-RuntimeException (RuntimeExceptions are passed through)
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 2034369..9e36e71 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2109,25 +2109,6 @@ void SfxMedium::DoInternalBackup_Impl( const 
::ucbhelper::Content& aOriginalCont
 aTransactTemp.EnableKillingFile( true );
 }
 
-bool ensureFolder(
-uno::Reference< uno::XComponentContext > xCtx,
-uno::Reference< ucb::XCommandEnvironment > xEnv,
-const OUString& rFolder, ucbhelper::Content & result)
-{
-INetURLObject aURL( rFolder );
-OUString aTitle = aURL.getName( INetURLObject::LAST_SEGMENT, true, 
INetURLObject::DECODE_WITH_CHARSET );
-aURL.removeSegment();
-::ucbhelper::Content aParent;
-
-if ( ::ucbhelper::Content::create( aURL.GetMainURL( 
INetURLObject::NO_DECODE ),
-  xEnv, xCtx, aParent ) )
-{
-return ::utl::UCBContentHelper::MakeFolder(aParent, aTitle, result);
-}
-
-return false;
-}
-
 //--
 void SfxMedium::DoInternalBackup_Impl( const ::ucbhelper::Conte

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/source

[Kohei Yoshida]

 sc/source/filter/xml/xmlcelli.cxx |   16 
 sc/source/filter/xml/xmlcelli.hxx |2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit df2c34045d753fc80484f7d7f128ec5e8b52ffc7
Author: Kohei Yoshida 
Date:   Mon Aug 26 15:28:46 2013 -0400

fdo#68581: The first paragraph text can be legitimately empty.

Change-Id: I2309a0c6aebc8a111e67e2e3d591cbabfbbadfb4
(cherry picked from commit 969d5a3b97903fe32b3a7da0c3de8bf86f323c17)
Reviewed-on: https://gerrit.libreoffice.org/5637
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index f4eb73e..7438e4b 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -600,10 +600,10 @@ void ScXMLTableRowCellContext::PushFormat(sal_Int32 
nBegin, sal_Int32 nEnd, cons
 
 OUString ScXMLTableRowCellContext::GetFirstParagraph() const
 {
-if (maFirstParagraph.isEmpty())
+if (!maFirstParagraph)
 return mpEditEngine->GetText(0);
 
-return maFirstParagraph;
+return *maFirstParagraph;
 }
 
 void ScXMLTableRowCellContext::PushParagraphFieldDate(const OUString& 
rStyleName)
@@ -635,12 +635,12 @@ void ScXMLTableRowCellContext::PushParagraphEnd()
 
 if (mbEditEngineHasText)
 {
-if (!maFirstParagraph.isEmpty())
+if (maFirstParagraph)
 {
 // Flush the cached first paragraph first.
 mpEditEngine->Clear();
-mpEditEngine->SetText(maFirstParagraph);
-maFirstParagraph = OUString();
+mpEditEngine->SetText(*maFirstParagraph);
+maFirstParagraph.reset();
 }
 mpEditEngine->InsertParagraph(mpEditEngine->GetParagraphCount(), 
maParagraph.makeStringAndClear());
 }
@@ -652,7 +652,7 @@ void ScXMLTableRowCellContext::PushParagraphEnd()
 }
 else if (mnCurParagraph == 0)
 {
-maFirstParagraph = maParagraph.makeStringAndClear();
+maFirstParagraph.reset(maParagraph.makeStringAndClear());
 mbEditEngineHasText = true;
 }
 
@@ -1089,10 +1089,10 @@ void ScXMLTableRowCellContext::PutTextCell( const 
ScAddress& rCurrentPos,
 }
 else if (mbEditEngineHasText)
 {
-if (!maFirstParagraph.isEmpty())
+if (maFirstParagraph)
 {
 // This is a normal text without format runs.
-rDoc.setStringCell(rCurrentPos, maFirstParagraph);
+rDoc.setStringCell(rCurrentPos, *maFirstParagraph);
 }
 else
 {
diff --git a/sc/source/filter/xml/xmlcelli.hxx 
b/sc/source/filter/xml/xmlcelli.hxx
index e49e3a3..15c95fb 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -63,9 +63,9 @@ class ScXMLTableRowCellContext : public ScXMLImportContext
 boost::optional maFormula; /// table:formula 
attribute
 boost::optional maStringValue; /// office:string-value 
attribute
 boost::optional maContentValidationName;
+boost::optional maFirstParagraph; /// unformatted first 
paragraph, for better performance.
 
 ScEditEngineDefaulter* mpEditEngine;
-OUString maFirstParagraph; /// unformatted first paragraph, for better 
performance.
 OUStringBuffer maParagraph;
 sal_Int32 mnCurParagraph;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: toolkit/source

[Julien Nabet]

 toolkit/source/controls/tree/treedatamodel.cxx |   21 +++--
 1 file changed, 7 insertions(+), 14 deletions(-)

New commits:
commit 8763c77c39507284d45eb79c29977eb0174b66f1
Author: Julien Nabet 
Date:   Tue Aug 27 07:25:33 2013 +0200

Simplify a bit iterator + remove double check

Change-Id: I4a12bacc1a3774741cf4bf3eb6770e16d0cecc6e
Reviewed-on: https://gerrit.libreoffice.org/5639
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/toolkit/source/controls/tree/treedatamodel.cxx 
b/toolkit/source/controls/tree/treedatamodel.cxx
index 891525d..292d685 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -436,23 +436,16 @@ void SAL_CALL MutableTreeNode::removeChildByIndex( 
sal_Int32 nChildIndex ) throw
 {
 ::osl::Guard< ::osl::Mutex > aGuard( maMutex );
 
-MutableTreeNodeRef xImpl;
+if( (nChildIndex < 0) || (nChildIndex >= (sal_Int32)maChildren.size()) )
+throw IndexOutOfBoundsException();
 
-if( (nChildIndex >= 0) && (nChildIndex < (sal_Int32)maChildren.size()) )
-{
-TreeNodeVector::iterator aIter( maChildren.begin() );
-while( nChildIndex-- && (aIter != maChildren.end()) )
-++aIter;
+MutableTreeNodeRef xImpl;
 
-if( aIter != maChildren.end() )
-{
-xImpl = (*aIter);
-maChildren.erase( aIter );
-}
-}
+TreeNodeVector::iterator aIter( maChildren.begin() );
+std::advance(aIter, nChildIndex);
 
-if( !xImpl.is() )
-throw IndexOutOfBoundsException();
+xImpl = (*aIter);
+maChildren.erase( aIter );
 
 xImpl->setParent(0);
 xImpl->mbIsInserted = false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 44446] LibreOffice 3.6 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=6

Bug 6 depends on bug 46060, which changed state.

Bug 46060 Summary: Writer corrupts DOCX file containing TOC, recovery not 
possible with Office 2010
https://bugs.freedesktop.org/show_bug.cgi?id=46060

   What|Removed |Added

 Status|ASSIGNED|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

Smart-Art in Writer - Correct 'Import' approach ?

[Adam Fyne]

Hi Community,

We are doing some work on implementing 'Smart-Art *Preservation*' in Writer.

Meaning – if the user doesWordèLOèWordround-trip we plan that they
won't lose their Smart-Art object.

Currently Smart-Art is being imported into *simple shapes* in Writer (which
don't exactly look the same), and most of the actual data and binding
between shapes is lost (not to mention it doesn't look the same).

In order to preserve the original Smart-Art object – we would plan on
loading the entire XML nodes and attributes of Smart-Art to property maps
(e.g. Miklos's great 'InteropGrabBag').

In addition, instead of showing to the user simple shapes (that he can
currently edit and move around) –

we would like to change this and show the user a *locked* bitmap of the
smart-art, that the user cannot manipulate (so that he can at least
preserve the original Smart-Art).



Is the approach we are taking good (changing the current malfunctioning
behavior that converts Smart-Art to shapes).

Should we take a different approach that maybe pops a message when loading
a DOCX with Smart-Art asking the user:

*"We noticed you are importing a DOCX with Smart-Art. Would you like to
preserve it and keep it un-editable or convert it to simple shapes ?"*

And then act according to the user's choice? (choosing simple shapes will
lose the 'Smart-Art' functionality, while choosing 'preserve' will not let
the user edit the smart-art, only see it).



Best,

*Adam Fyne*

*Office:* +972-77-517-5008

Twitter  |
LinkedIn
 | Facebook  | Blog
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Project ...

[Jakub Kościelak]

Dear Developers

I would like to ask if someone would be interested in taking part in a
project focused on adding missing functionality to LibreOffice.

I wanted to ask if anyone of you have already dealt with, or is in the
process of work on the following issues.

Any information will be extremely useful:

- Ability to work on documents created in Microsoft Word 2003 or
Microsoft Word 2007 and 2010, with reliable conversion of all elements
and attributes of the document - a lot has been done already.

- Recording a narration and adding it to a presentation.

- Creating reports based on external data sources (spreadsheets,
databases, ODBC-compliant, text files, XML, webservice) - partially
requirements are met, except for XML and webservice.

- Support for OLAP cubes, performing, editing database and web queries.
Tools to support statistical, financial, analysis of alternatives and
solving optimization issues - requirements partly met, there is a solver.

- Maintaining full compatibility with the file formats created in
Microsoft Excel 2003, 2007 and 2010, including the correct application
of special functions and macros - a lot has already been done, macros
are the biggest problem.

- Using mail merge in Draw.

I have gathered, I think, an appropriate budget for this project.
I'm looking for experienced professionals, and where to find them first
if not here?
Thank you in advance for any advice and tips.

All the best,
Jakub Kościelak



___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-qa] QA Meeting Minutes - 2013-08-23

[Terrence Enger]

> (*) Florian R. - If new repo --> Include older versions!!
>
> (*) Bjoern - Including older versions would expand the
> repository and make the initial download size much larger
> (might be scary for first-time QA members?)

Perhaps we could get a lot of the benefit of the older versions from
just a few of them.  We would not be able to locate a regression with
precision, but that could be a good tradeoff.  Of course, the oldest
version found in the bibisect40 repositiory and the earliest runnable
version of LibreOffice would be particularly interesting.

Terry.


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Project focused on adding missing functionality to LibreOffice.

[Jakub Kościelak]

Dear Developers

I would like to ask if someone would be interested in taking part in a 
project focused on adding missing functionality to LibreOffice.


I wanted to ask if anyone of you have already dealt with, or is in the 
process of work on the following issues.


Any information will be extremely useful:

- Ability to work on documents created in Microsoft Word 2003 or 
Microsoft Word 2007 and 2010, with reliable conversion of all elements 
and attributes of the document - a lot has been done already.


- Recording a narration and adding it to a presentation.

- Creating reports based on external data sources (spreadsheets, 
databases, ODBC-compliant, text files, XML, webservice) - partially 
requirements are met, except for XML and webservice.


- Support for OLAP cubes, performing, editing database and web queries. 
Tools to support statistical, financial, analysis of alternatives and 
solving optimization issues - requirements partly met, there is a solver.


- Maintaining full compatibility with the file formats created in 
Microsoft Excel 2003, 2007 and 2010, including the correct application 
of special functions and macros - a lot has already been done, macros 
are the biggest problem.


- Using mail merge in Draw.

I have gathered, I think, an appropriate budget for this project.
I'm looking for experienced professionals, and where to find them first 
if not here?

Thank you in advance for any advice and tips.

All the best,
Jakub Kościelak

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

libre office basic BUG (I believe so)

[joseramos]

Hi fellows and thanks for your attention. First, I learned VBA
 with Excel by my self.  I have no expertise programming in any 
language. For now on, I have to use Calc as much as Excel.
I'm trying to include conditional format thru a basic program.
I have to create a spreadsheet with conditional format with lots of 
cells. Every cell will have a unique formula.
Everything I found so far, led me to code below. This is a very short 
example, not the real one, for better view. The extrange thing 
is: the cell reference in the formula gets totally changed.
To understand what I'm writing about, copy this code and execute it. 
Don't forget to change sheet name in code or
just rename your sheet with "Example".
After, go to cell B7 and look at conditional format using format menu. 
You will see B7 changed to C13. And at B8, 
you will see B7 changed to C15. And you may see any other cell inserted 
by this code has the same problem (B7->C13, 
C7->D13,B8->C15,C8->D15,...).
I used it at version 3.3.3. Also downloaded version 4.0.3 and the 
problem still remain. Also tried use absolute reference. The 
formula keeps right but not work in sheet. I have to remove "$" 
manually. When it done, works fine. Somebody know what's happening? I post this queston at AskLibo in August 7 and nothing so far.For any help, many thanks...Sub Example    Dim mCond(2) As New com.sun.star.beans.PropertyValue    Dim oEntrys As Variant    Dim oCell as object, oDoc as object, oSheet as object    Dim iLine as integer, iColumn as integer    Dim aColumn(9) as string    oDoc = ThisComponent    oSheet=oDoc.Sheets.getByName("Example")    aColumn(0)="A": aColumn(1)="B": aColumn(2)="C": aColumn(3)="D"    aColumn(4)="E": aColumn(5)="F": aColumn(6)="G": aColumn(7)="H"    aColumn(8)="I": aColumn(9)="J"    For iLine = 6 to 9    For iColumn = 1 to 9    oCell = oSheet.getCellByPosition(iColumn,iLine)    oEntrys = oCell.getPropertyValue("ConditionalFormat")    oEntrys.clear()    if iLine mod 2 = 0 then   ' this formula start at line 7, first cell B7   ' looking at sheet, format menu, conditional format you will see C13   mCond(0).Name = "Operator"   mCond(0).Value = com.sun.star.sheet.ConditionOperator.FORMULA   mCond(1).Name = "Formula1"   mCond(1).Value = aColumn(iColumn) & iLine+1 & ">80"   mCond(2).Name = "StyleName"   mCond(2).Value = "Good"   oEntrys.addNew(mCond())   oCell.setPropertyValue("ConditionalFormat", oEntrys)   mCond(0).Name = "Operator"   mCond(0).Value = com.sun.star.sheet.ConditionOperator.FORMULA   mCond(1).Name = "Formula1"   mCond(1).Value = aColumn(iColumn) & iLine+1 & ">60"   mCond(2).Name = "StyleName"   mCond(2).Value = "Average"   oEntrys.addNew(mCond())   oCell.setPropertyValue("ConditionalFormat", oEntrys)   else   ' this start at line 8, first cell B8, and in this case you see C15   mCond(0).Name = "Operator"   mCond(0).Value = com.sun.star.sheet.ConditionOperator.FORMULA   mCond(1).Name = "Formula1"   mCond(1).Value = aColumn(iColumn) & iLine+1 & ">80"   mCond(2).Name = "StyleName"   mCond(2).Value = "Keep"   oEntrys.addNew(mCond())      oCell.setPropertyValue("ConditionalFormat", oEntrys)   mCond(0).Name = "Operator"   mCond(0).Value = com.sun.star.sheet.ConditionOperator.FORMULA   mCond(1).Name = "Formula1"   mCond(1).Value = aColumn(iColumn) & iLine+1 & "<60"   mCond(2).Name = "StyleName"   mCond(2).Value = "Review"   oEntrys.addNew(mCond())   oCell.setPropertyValue("ConditionalFormat", oEntrys)   end if   Next   NextEnd SubJosé Ramos
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: package/source svl/source

[Stephan Bergmann]

 package/source/xstor/xfactory.cxx |2 +-
 svl/source/fsstor/fsfactory.cxx   |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5e9137c9635141430b946aae2d0317c432a471ef
Author: Stephan Bergmann 
Date:   Tue Aug 27 14:49:38 2013 +0200

These shall apparently check for URL scheme prefix match

...they had originally been

  aURL.equalsIgnoreAsciiCaseAsciiL( "vnd.sun.star.pkg", 16 )

etc., so where likely confused with the OUString compareTo functions that 
take a
maxLength argument.

Change-Id: Ie12df4f589dda310b7e49eb93535ad797f88a8a7

diff --git a/package/source/xstor/xfactory.cxx 
b/package/source/xstor/xfactory.cxx
index 2aed9f7..db339ae 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -139,7 +139,7 @@ uno::Reference< uno::XInterface > SAL_CALL 
OStorageFactory::createInstanceWithAr
 throw lang::IllegalArgumentException(); // TODO:
 }
 
-if ( aURL.equalsIgnoreAsciiCase("vnd.sun.star.pkg") )
+if ( aURL.startsWithIgnoreAsciiCase("vnd.sun.star.pkg:") )
 {
 OSL_FAIL( "Packages URL's are not valid for storages!\n" ); // ???
 throw lang::IllegalArgumentException(); // TODO:
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index 52c599e..2396bf0 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.cxx
@@ -127,8 +127,8 @@ uno::Reference< uno::XInterface > SAL_CALL 
FSStorageFactory::createInstanceWithA
 
 // allow to use other ucp's
 // if ( !isLocalNotFile_Impl( aURL ) )
-if ( aURL.equalsIgnoreAsciiCase("vnd.sun.star.pkg")
-  || aURL.equalsIgnoreAsciiCase("vnd.sun.star.zip")
+if ( aURL.startsWithIgnoreAsciiCase("vnd.sun.star.pkg:")
+  || aURL.startsWithIgnoreAsciiCase("vnd.sun.star.zip:")
   || ::utl::UCBContentHelper::IsDocument( aURL ) )
 {
 throw lang::IllegalArgumentException(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build fails when --with-help is enabled

[Miklos Vajna]

On Tue, Aug 27, 2013 at 12:12:34PM +0100, Flavio Moringa 
 wrote:
> That seems to shed some light on the problem... Also using "C:/" paths
> instead of "/cygdrive/c" in the script upack-sources when using cygwin it's
> problematic...

Actually I'm not sure anybody tried that combo: Linux distros build from
tarballs, but possibly on Windows everybody just builds from git (note
that in git, you can checkout a given tag, and then build that, so are
not forced to build a random state of a given branch).


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Strange loop in SwDoc::GetExtTextInput

[Matteo Casalin]

Hi Michael

On Tue, 27 Aug 2013 14:15:38 +0200
Michael Stahl  wrote:

> On 26/08/13 12:55, Matteo Casalin wrote:
> > Hi all,
> >   I stumbled upon the following loop [1] on a Ring, which seems 
> > wrong to me:
> > 
> > SwExtTextInput* pTmp = (SwExtTextInput*)mpExtInputRing;
> > do {
> >  //
> >  // do something that does not modify pTmp nor mpExtInputRing
> >  //
> > } while( mpExtInputRing != (pTmp = (SwExtTextInput*)mpExtInputRing ) );
> > 
> > from my understanding it processes just mpExtInputRing item and then 
> > exits. I think that it should be something like:
> > 
> > do {
> >  //
> >  // do something
> >  //
> >  pTmp = (SwExtTextInput*)pTmp->GetNext();
> > } while( pTmp!=mpExtInputRing );
> > 
> > Am I missing something, is the loop to to be fixed as suggested of to be 
> > removed completely?
> 
> i think you are completely right, although i don't know why that
> extended-input stuff would bother with rings in the first place - does
> anybody really use input methods in multiple places simultaneously, or
> what is the point of that?
> 

I will submit a patch for the loop, although it will take some days.
I don't know the details and, if I remember correctly, that code is quite old, 
so it can be something that is outdated.
Thanks!
Matteo

> 
> ___
> 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-commits] core.git: Branch 'libreoffice-4-1' - sw/source

[Adam Co]

 sw/source/filter/ww8/docxattributeoutput.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 59d8dde3fc9a4dc653e43efb8552efc4ab3efc92
Author: Adam Co 
Date:   Sun Jul 21 16:27:45 2013 +0300

fdo#66145 DOCX export: fix not-well-formed output

Reviewed-on: https://gerrit.libreoffice.org/5002
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 
(partially cherry picked from commit 
2d5978b22b402dea9dee5b468d2044ccc1208a15)

Change-Id: Id8cc3829ccd5806295b0f240a570dc1d66ed0c87
Signed-off-by: Miklos Vajna 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0e2ee5e8..d7c008f 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -419,7 +419,9 @@ void DocxAttributeOutput::StartParagraphProperties( const 
SwTxtNode& rNode )
 if ( aNextIndex.GetNode().IsTxtNode() )
 {
 const SwTxtNode* pTxtNode = static_cast< SwTxtNode* >( 
&aNextIndex.GetNode() );
-m_rExport.OutputSectionBreaks( pTxtNode->GetpSwAttrSet(), *pTxtNode );
+// If next node has no string - it is an empty node, so no need to 
output the section break
+if (!pTxtNode->GetTxt().isEmpty())
+m_rExport.OutputSectionBreaks( pTxtNode->GetpSwAttrSet(), 
*pTxtNode );
 }
 else if ( aNextIndex.GetNode().IsTableNode() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Question o default persona

[Olivier Hallot]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1

Hi Kendy

Em 26-08-2013 11:35, Jan Holesovsky escreveu:
> Hi Olivier,
> 
> [adding the ML in case this was interesting for others]
> 
> Olivier Hallot píše v So 24. 08. 2013 v 09:40 -0300:
> 
> Search for the settings.cxx there.  I like your solution (default
> persona in 'program/gallery/personas/' instead of in
> 'program/edition/'), so let's stick to that going forward :-)  Merged as
> 
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=65afcc5a9e440ef4b1ac15800b2c32c4219a2908
> 

Thanks. Just to clarify, the default gallery folder I created is in
share/, not program/

Regards
- -- 
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Fundação responsável civilmente, de acordo com o direito civil
Detalhes Legais: http://www.documentfoundation.org/imprint
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.12 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/

iQEcBAEBAgAGBQJSHJ1UAAoJEJp3R7nH3vLxIWMH/RPKLWwuD0FWRS6pZdd/9gE6
6MFt82DoTu03UObiOI6OmbdrkVjMMcx8fy74nXCUBKU+/s+GznhRSRDeFjUDrUWp
2j1pO53rvtKLCMpKnPelfDbwfPH0qorL0aeSVL+4djYnOas0HwSlroSGBnfwUpQc
0pRdViHoR4lYumXY7Wrv5K8VVmizz7gab7LjZ7pupOKPRPI+sAMZSa/K78kT4pt3
z0jqI6ORir5t4QZnmLY3CI6HBuRZ8QVwuwcbgY2Pirp6e5swH1QgFiotcF7hKR19
tDm3k1iEiK8jayAE+3vA7jHQ9zetDZRKrOkWGIRXffKVVpGT/yPXVU6uZFlE4Hc=
=Afcx
-END PGP SIGNATURE-
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] dev-tools.git: scripts/esc-bug-stats.pl

[Michael Meeks]

 scripts/esc-bug-stats.pl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2650bc0f653ca6c32089363253df4f38a19ebc79
Author: Michael Meeks 
Date:   Tue Aug 27 13:29:33 2013 +0100

de-mangle a formula.

diff --git a/scripts/esc-bug-stats.pl b/scripts/esc-bug-stats.pl
index c17d960..9375352 100755
--- a/scripts/esc-bug-stats.pl
+++ b/scripts/esc-bug-stats.pl
@@ -262,7 +262,7 @@ print << "EOF"
  
  
  
- 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

tommy27  changed:

   What|Removed |Added

   Hardware|x86 (IA32)  |All
 OS|Linux (All) |All

-- 
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: Strange loop in SwDoc::GetExtTextInput

[Michael Stahl]

On 26/08/13 12:55, Matteo Casalin wrote:
> Hi all,
>   I stumbled upon the following loop [1] on a Ring, which seems 
> wrong to me:
> 
> SwExtTextInput* pTmp = (SwExtTextInput*)mpExtInputRing;
> do {
>  //
>  // do something that does not modify pTmp nor mpExtInputRing
>  //
> } while( mpExtInputRing != (pTmp = (SwExtTextInput*)mpExtInputRing ) );
> 
> from my understanding it processes just mpExtInputRing item and then 
> exits. I think that it should be something like:
> 
> do {
>  //
>  // do something
>  //
>  pTmp = (SwExtTextInput*)pTmp->GetNext();
> } while( pTmp!=mpExtInputRing );
> 
> Am I missing something, is the loop to to be fixed as suggested of to be 
> removed completely?

i think you are completely right, although i don't know why that
extended-input stuff would bother with rings in the first place - does
anybody really use input methods in multiple places simultaneously, or
what is the point of that?


___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/source

[Zolnai Tamás]

 sw/source/core/layout/paintfrm.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit aa279b32a8db69d00aa625714c3894f02ee9de26
Author: Zolnai Tamás 
Date:   Tue Aug 27 14:03:51 2013 +0200

Avoid painting of empty shadow

Change-Id: Ie293ad397b8b3f6db7d79dc4ff03c18cf896dfa2

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index 9095a72..1797b88 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4877,8 +4877,11 @@ void PaintCharacterBorder(
 0, &rFont.GetShadowColor(), rFont.GetShadowWidth(),
 rFont.GetAbsShadowLocation(bVerticalLayout));
 
-lcl_PaintShadow( SwRect(aAlignedRect), aAlignedRect, aShadow,
- false, bTop, bBottom, bLeft, bRight);
+if( aShadow.GetLocation() != SVX_SHADOW_NONE )
+{
+lcl_PaintShadow( SwRect(aAlignedRect), aAlignedRect, aShadow,
+ false, bTop, bBottom, bLeft, bRight);
+}
 }
 
 // Init borders, after this initialization top, bottom, right and left 
means the
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - jvmfwk/distributions Repository.mk sal/textenc scp2/source solenv/gbuild ure/source

[Stephan Bergmann]

 Repository.mk   |   18 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml  |8 
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml|   12 -
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml   |6 
 jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml |2 
 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml  |4 
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml  |6 
 sal/textenc/textenc.cxx |3 
 scp2/source/ooo/ure.scp |   48 -
 solenv/gbuild/Helper.mk |2 
 solenv/gbuild/platform/IOS_ARM_GCC.mk   |4 
 solenv/gbuild/platform/android.mk   |4 
 solenv/gbuild/platform/com_MSC_class.mk |4 
 solenv/gbuild/platform/macosx.mk|4 
 solenv/gbuild/platform/mingw.mk |7 
 solenv/gbuild/platform/solaris.mk   |4 
 solenv/gbuild/platform/unxgcc.mk|4 
 ure/source/README   |  101 +---
 18 files changed, 96 insertions(+), 145 deletions(-)

New commits:
commit 644c33a857c46d540202189228f519946dc33833
Author: Stephan Bergmann 
Date:   Tue Aug 27 13:58:52 2013 +0200

fdo#67313: Use "lo" suffix for private URE libs

...(like is done for most of LO's non-URE libs already) to reduce 
likelihood of
name clashes, esp. on Windows where URE libs are found via PATH.

This introduces PRIVATELIBS_URE, and removes now-unused UNOLIBS_URE.

Change-Id: Ib95dd45f18de140a54e62d632dbf2239f83c232e

diff --git a/Repository.mk b/Repository.mk
index f69f10f..8c62763 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -449,21 +449,13 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \
$(if $(ENABLE_JAVA),java_uno) \
$(if $(ENABLE_JAVA),juh) \
$(if $(ENABLE_JAVA),juhx) \
-   $(if $(ENABLE_JAVA),jvmaccess) \
-   $(if $(ENABLE_JAVA),jvmfwk) \
log_uno \
-   reg \
-   sal_textenc \
-   store \
-   $(if $(ENABLE_JAVA),sunjavaplugin) \
-   unoidl \
unsafe_uno \
$(if $(URELIBS),urelibs) \
-   xmlreader \
$(if $(filter MSC,$(COM)),$(if $(filter 
INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \
 ))
 
-$(eval $(call gb_Helper_register_libraries_for_install,UNOLIBS_URE,ure, \
+$(eval $(call gb_Helper_register_libraries_for_install,PRIVATELIBS_URE,ure, \
acceptor \
binaryurp \
bootstrap \
@@ -473,14 +465,22 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,UNOLIBS_URE,ure, \
invocation \
$(if $(ENABLE_JAVA),javaloader) \
$(if $(ENABLE_JAVA),javavm) \
+   $(if $(ENABLE_JAVA),jvmaccess) \
+   $(if $(ENABLE_JAVA),jvmfwk) \
namingservice \
proxyfac \
reflection \
+   reg \
+   sal_textenc \
stocservices \
+   store \
streams \
+   $(if $(ENABLE_JAVA),sunjavaplugin) \
textinstream \
textoutstream \
+   unoidl \
uuresolver \
+   xmlreader \
 ))
 
 $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index 2453492..bfd80e0 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -38,9 +38,9 @@
  
 
  
-  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so
-  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so
-  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so
-  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so
+  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so
+  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so
+  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so
+  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so
  
 
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index 2ff9946..311bf81 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -44,11 +44,11 @@
  
 
  
-  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so
-  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so
-  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so
-  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so
-  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so
-  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavaplugin.so
+  vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/libsunjavapluginlo.so
+  vnd.su

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Bug 54157 depends on bug 55618, which changed state.

Bug 55618 Summary: LOCALHELP: obsolete for CALC Conditional Formatting
https://bugs.freedesktop.org/show_bug.cgi?id=55618

   What|Removed |Added

 Status|NEW |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: sc/source

[Andras Timar]

 sc/source/ui/src/condformatdlg.src |1 +
 sc/source/ui/src/condformatmgr.src |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 751fe319dc1a5ae99b3e4874791d6c171f9d20f0
Author: Andras Timar 
Date:   Tue Aug 27 13:06:05 2013 +0200

add HelpIDs to CALC Conditional Formatting dialogs

Change-Id: I7b56a3af83afcb7ca41fa92415ea1591af3b85d2

diff --git a/sc/source/ui/src/condformatdlg.src 
b/sc/source/ui/src/condformatdlg.src
index da9601d..e0f13a1 100644
--- a/sc/source/ui/src/condformatdlg.src
+++ b/sc/source/ui/src/condformatdlg.src
@@ -11,6 +11,7 @@
 
 ModalDialog RID_SCDLG_CONDFORMAT
 {
+HelpID = "sc:ModalDialog:RID_SCDLG_CONDFORMAT";
 OutputSize = TRUE;
 Hide = TRUE;
 Size = MAP_APPFONT ( 300, 300 );
diff --git a/sc/source/ui/src/condformatmgr.src 
b/sc/source/ui/src/condformatmgr.src
index 9009d21..035d736 100644
--- a/sc/source/ui/src/condformatmgr.src
+++ b/sc/source/ui/src/condformatmgr.src
@@ -12,6 +12,7 @@
 
 ModalDialog RID_SCDLG_COND_FORMAT_MANAGER
 {
+HelpID = "sc:ModalDialog:RID_SCDLG_COND_FORMAT_MANAGER";
 OutputSize = TRUE;
 Hide = TRUE;
 Size = MAP_APPFONT ( 300, 275 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Andras Timar]

 source/text/scalc/01/0512.xhp |  143 +++---
 source/text/scalc/guide/cellstyle_conditional.xhp |4 
 2 files changed, 102 insertions(+), 45 deletions(-)

New commits:
commit 39a7e6c2242bbe9050f4b7a408d95f06dcfd7a02
Author: Andras Timar 
Date:   Tue Aug 27 13:05:14 2013 +0200

fdo#55618 update help for CALC Conditional Formatting

Change-Id: I409e6bd6452eda75dd0319adcd07b3f9a4603255

diff --git a/source/text/scalc/01/0512.xhp 
b/source/text/scalc/01/0512.xhp
index aafe0bc..b0bb03c 100644
--- a/source/text/scalc/01/0512.xhp
+++ b/source/text/scalc/01/0512.xhp
@@ -28,60 +28,117 @@


 
-
+
 Conditional Formatting
   Choose Conditional Formatting 
to define format styles depending on certain conditions.
- If a style was already assigned to a cell, it remains unchanged. 
The style entered here is then evaluated. You can enter three conditions that 
query the contents of cell values or formulas. The conditions are evaluated 
from 1 to 3. If the condition 1 matches the condition, the defined style will 
be used. Otherwise, condition 2 is evaluated, and its defined style used. If 
this style does not match, condition 3 is evaluated.
+ If a style was already assigned to a cell, it remains unchanged. 
The style entered here is then evaluated. There are several types of 
conditional formatting that can be used.
+  You can 
enter several conditions that query the contents of cell values or formulas. 
The conditions are evaluated from the first to the last. If the condition 1 
matches the condition, the defined style will be used. Otherwise, condition 2 
is evaluated, and its defined style is used. If this style does not match, then 
the next condition is evaluated and so on.
   
  
   
   To apply conditional formatting, AutoCalculate must be enabled. 
Choose Tools - Cell Contents - AutoCalculate (you see a check mark next to the 
command when AutoCalculate is enabled).
 conditional formatting; 
conditions
 
-
-
-
-Condition 1/2/3
-  Mark the 
boxes corresponding to each condition and enter the corresponding 
condition. To close the dialog, click OK.
-
-
-
-Cell Value / Formula
-  Specifies if 
conditional formatting is dependent on a cell value or a formula. If 
you select a formula as a reference, the Cell Value Condition box 
is displayed to the right of the Cell value/Formula field. If the 
condition is "Formula is", enter a cell reference. If the cell reference is a 
value other than zero, the condition matches.
-
-
-
-Cell Value Condition
-  Choose a 
condition for the format to be applied to the selected 
cells.
-
-
-
-Cell Style
-  Choose the style to be 
applied if the specified condition matches.
-
-
-
-New Style
-  If you haven't already defined a style to be used, 
you can click New Style to open the Organizer tab page of the Cell Style 
dialog. Define a new style there and click OK.
-
-
-
-
-
-
-Parameter field
-  Enter a reference, value or formula. Enter a 
reference, value or formula in the parameter field, or in both parameter fields 
if you have selected a condition that requires two parameters. You can also 
enter formulas containing relative references.
-  Once the parameters have been defined, the condition is complete. 
It may appear as:
-  Cell value is equal 0: Cell style Null value (You must have already 
defined a cell style with this name before assigning it to a 
condition).
-  Cell value is between $B$20 and $B$21: Cell style Result 
(The corresponding value limits must already exist in cells B20 and 
B21).
-  Formula is SUM($A$1:$A$5)=10: Cell style Result (The 
selected cells are formatted with the Result style if the sum of the contents 
in cells A1 to A5 is equal to 10).
-  
+Condition
+  You can 
define as many conditions as you want.
+  Specify 
if conditional formatting is dependent on one of the entry listed on the drop 
down box:
+  
+  
+  If 
you select All cells, see Color Scale, Data Bar or Icon Set
+  explanations below, depending on which visual representation the 
conditional formatting should be represented.
+  
+  
+  If 
you select Cell value is:
+  
+  
+  Select a condition in the drop down list for the format to be 
applied to the selected cells and enter the value.
+  
+  
+  In front of Apply Styles, select the desired style 
in the list or chose New Style to create one.
+  
+  
+  Click the Add button to add another condition, 
click the Remove button to remove a condition.
+  
+  
+  In the Range field, define the range of cells 
concerned by the conditional formatting. Click on the Shrink 
button to minimize the dialog box. Click again on the button to come back to 
the dialog box once the range is selected.
+  
+  
+  
+  
+  If you 

[Libreoffice-commits] core.git: helpcontent2

[Andras Timar]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0fdc9a07e97fedcefb6de4b97f0b23321e83565d
Author: Andras Timar 
Date:   Tue Aug 27 13:05:14 2013 +0200

Updated core
Project: help  39a7e6c2242bbe9050f4b7a408d95f06dcfd7a02

diff --git a/helpcontent2 b/helpcontent2
index 3bb6a44..39a7e6c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3bb6a44f94e5fa896748085a54f91f4ecffacc38
+Subproject commit 39a7e6c2242bbe9050f4b7a408d95f06dcfd7a02
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=54157

Ritu  changed:

   What|Removed |Added

   Hardware|All |x86 (IA32)
 OS|All |Linux (All)

-- 
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: sw/source

[Zolnai Tamás]

 sw/source/core/layout/paintfrm.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 212b225da7e4817fb7a090deba3cd3513c034526
Author: Zolnai Tamás 
Date:   Tue Aug 27 13:29:01 2013 +0200

OSL_ENSURE(false) -> assert(false)

Change-Id: I236f19cc33ee3cc51f47732ce3b753886c484580

diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index b86ca4c..9095a72 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4354,7 +4354,7 @@ static void lcl_PaintShadow( const SwRect& rRect, SwRect& 
rOutRect,
 }
 break;
 default:
-OSL_ENSURE( false, "new ShadowLocation() ?" );
+assert(false);
 break;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build fails when --with-help is enabled

[Flavio Moringa]

I,

thanks for helping.

Yes you are right, I'm building from the source tarball...

I will then unpack the dictionaries and help sourecs to the build root...

Will tell if it worked... I was also looking at this thread:
http://comments.gmane.org/gmane.linux.lfs.beyond.support/47479

That seems to shed some light on the problem... Also using "C:/" paths
instead of "/cygdrive/c" in the script upack-sources when using cygwin it's
problematic...

Cheers


*Flávio Moringa*
Project Leader



Caixa Mágica Software
Energia Open Source
Rua Soeiro Pereira Gomes, Lote 1 - 4.º B,
Edifício Espanha, 1600-196 Lisboa - Portugal
Tel.: +351 217 921 260 Fax: +351 217 921 261
http://www.caixamagica.pt
https://twitter.com/flaviomoringa
https://www.facebook.com/flaviomoringa
http://pt.linkedin.com/in/flaviomoringa
http://people.caixamagica.pt/flaviomoringa



2013/8/27 Miklos Vajna 

> On Tue, Aug 27, 2013 at 11:35:57AM +0100, Flavio Moringa <
> flavio.mori...@caixamagica.pt> wrote:
> > I get the following error:
> >
> > $ /opt/lo/bin/make
> > C:/libreoffice-4.1.0.4/bin/unpack-sources C:/libreoffice-4.1.0.4
> > C:/libreoffice-4.1.0.4/src/libreoffice-dictionaries-4.1.0.4.tar.xz
> > C:/libreoffice-4.1.0.4/src/libreoffice-help-4.1.0.4.tar.xz
> > Error: C:/libreoffice-4.1.0.4 is not a valid LibreOffice core source
> directory
> > make: *** [get-submodules] Error 1
>
> Seems you're not building from git. If you build from a tarball, just
> get the help tarball as well, and unpack it just like you unpacked the
> core tarball as well, before you start autogen/make.
>
> With that, the get-submodules target should notice that everything is
> already unpacked and won't even call bin/unpack-sources.
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[REMINDER] Code-freeze for 4.1.2 is next Monday (2013-09-02)

[Christian Lohmaier]

Hi *,

this is a reminder that next Monday ( 2013-09-02) is code-freeze and
branch off for LibreOffice 4.1.2

So if you have stuff that should be part of 4.1.2, please make sure to
submit any patches for review/nag people to review them this week.

See also
https://wiki.documentfoundation.org/Development/Branches
https://wiki.documentfoundation.org/ReleasePlan/4.1#4.1.2_release

Thanks a lot & happy hacking,

Christian
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Build fails when --with-help is enabled

[Miklos Vajna]

On Tue, Aug 27, 2013 at 11:35:57AM +0100, Flavio Moringa 
 wrote:
> I get the following error:
> 
> $ /opt/lo/bin/make
> C:/libreoffice-4.1.0.4/bin/unpack-sources C:/libreoffice-4.1.0.4
> C:/libreoffice-4.1.0.4/src/libreoffice-dictionaries-4.1.0.4.tar.xz
> C:/libreoffice-4.1.0.4/src/libreoffice-help-4.1.0.4.tar.xz
> Error: C:/libreoffice-4.1.0.4 is not a valid LibreOffice core source directory
> make: *** [get-submodules] Error 1

Seems you're not building from git. If you build from a tarball, just
get the help tarball as well, and unpack it just like you unpacked the
core tarball as well, before you start autogen/make.

With that, the get-submodules target should notice that everything is
already unpacked and won't even call bin/unpack-sources.


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

URGENT: Build fails when --with-help is enabled

[Flavio Moringa]

I guys,

I've already made a windows build using this options:

./autogen.sh \
--enable-release-build \
--enable-extra-gallery \
--enable-extra-sample \
--enable-extra-font \
--enable-extra-template \
--verbose \
--enable-verbose \
--disable-activex \
--without-junit \
--with-ant-home="/cygdrive/c/apache-ant-1.9.2/"


But now I need to add:

--with-help
--with-myspell-dicts

autogen goes ok... but when I do a:
/opt/lo/bin/make

I get the following error:

$ /opt/lo/bin/make
C:/libreoffice-4.1.0.4/bin/unpack-sources C:/libreoffice-4.1.0.4
C:/libreoffice-4.1.0.4/src/libreoffice-dictionaries-4.1.0.4.tar.xz
C:/libreoffice-4.1.0.4/src/libreoffice-help-4.1.0.4.tar.xz
Error: C:/libreoffice-4.1.0.4 is not a valid LibreOffice core source directory
make: *** [get-submodules] Error 1

So what's wrong? Why does it say it's not a core source directory? I
don't seem to find anything wrong in "bin/unpack-sources"


I really need some help here... does anyone have any clues?

Thanks


*Flávio Moringa*
Project Leader



Caixa Mágica Software
Energia Open Source
Rua Soeiro Pereira Gomes, Lote 1 - 4.º B,
Edifício Espanha, 1600-196 Lisboa - Portugal
Tel.: +351 217 921 260 Fax: +351 217 921 261
http://www.caixamagica.pt
https://twitter.com/flaviomoringa
https://www.facebook.com/flaviomoringa
http://pt.linkedin.com/in/flaviomoringa
http://people.caixamagica.pt/flaviomoringa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] mso-dumper.git: 2 commits - src/msodraw.py test/doc

[Miklos Vajna]

 src/msodraw.py  |   34 --
 test/doc/pass/abi5027-1.doc |binary
 2 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit 748b246a0bfd5159372cff62a2ccbdb0eddeaed1
Author: Miklos Vajna 
Date:   Tue Aug 27 12:35:17 2013 +0200

msodraw: dump pibFlags

diff --git a/src/msodraw.py b/src/msodraw.py
index 0ec4378..7af5809 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -688,6 +688,19 @@ class FOPT:
 for i in FOPT.ShapeBooleanProperties.memberNames:
 recHdl.appendLine('<%s value="%s"/>' % (i, getattr(self, i)))
 
+class PibFlags:
+"""An MSOBLIPFLAGS enumeration value, that specifies how to interpret
+the pibName property."""
+def __parseBytes(self, prop):
+self.pibFlags = globals.getValueOrUnknown(MSOBLIPFLAGS, 
prop.value, "todo")
+
+def appendLines (self, recHdl, prop, level):
+recHdl.appendLine(indent(level)+"pibFlags: %s"%prop.value)
+
+def dumpXml(self, recHdl, prop):
+self.__parseBytes(prop)
+recHdl.appendLine('' % 
(self.pibFlags, hex(prop.value)))
+
 propTable = {
 0x00BF: ['Text Boolean Properties', TextBoolean],
 0x00C0: ['gtextUNICODE', GtextUNICODE],
@@ -747,6 +760,8 @@ class FOPT:
 0x01D7: ['lineEndCapStyle'],
 0x0104: ['pib'],
 0x018C: ['fillFocus'],
+0x007F: ['Protection Boolean Properties'],
+0x0106: ['pibFlags', PibFlags],
 }
 
 class E:
@@ -1056,6 +1071,14 @@ MSOBLIPTYPE = {
 0x12: 'msoblipCMYKJPEG',
 }
 
+MSOBLIPFLAGS = {
+0x: 'msoblipflagComment',
+0x0001: 'msoblipflagFile',
+0x0002: 'msoblipflagURL',
+0x0004: 'msoblipflagDoNotSave',
+0x0008: 'msoblipflagLinkToFile',
+}
+
 class FBSE:
 """2.2.32 The OfficeArtFBSE record specifies a File BLIP Store Entry (FBSE)
 that contains information about the BLIP."""
commit 31ef6de85475d68f17a181dd56e778c6f15730a8
Author: Miklos Vajna 
Date:   Tue Aug 27 12:17:25 2013 +0200

msodraw: handle invalid utf-16 in pibName

diff --git a/src/msodraw.py b/src/msodraw.py
index 8384c48..0ec4378 100644
--- a/src/msodraw.py
+++ b/src/msodraw.py
@@ -491,10 +491,15 @@ class FOPT:
 
 def __init__(self, name):
 self.name = name
+self.todo = None
 
 def __parseBytes(self, prop):
 # A null-terminated Unicode string.
-self.string = prop.extra[0:-2].decode('utf-16')
+try:
+self.string = prop.extra[0:-2].decode('utf-16')
+except UnicodeDecodeError, reason:
+self.todo = reason
+self.string = prop.extra[0:-2].decode('utf-16', 
errors="replace")
 
 def appendLines(self, recHdl, prop, level):
 self.__parseBytes(prop)
@@ -502,7 +507,9 @@ class FOPT:
 
 def dumpXml(self, recHdl, prop):
 self.__parseBytes(prop)
-recHdl.appendLine('<%s value="%s"/>' % (self.name, self.string))
+if self.todo:
+print '' % 
self.todo
+recHdl.appendLine('<%s value="%s"/>' % (self.name, 
globals.encodeName(self.string)))
 
 class GtextUNICODE(UnicodeComplex):
 
diff --git a/test/doc/pass/abi5027-1.doc b/test/doc/pass/abi5027-1.doc
new file mode 100644
index 000..629cb33
Binary files /dev/null and b/test/doc/pass/abi5027-1.doc differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sc/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/textimportcsv.ui |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit f9f0f27d1a8556e283050e01e8ddbdc125b11ae4
Author: Caolán McNamara 
Date:   Tue Aug 27 10:39:05 2013 +0100

Resolves: fdo#68555 use (current) consistent ok/cancel/help button order

Change-Id: Id5bb5c48fe82229fe378500d7cacd36d8554707f
(cherry picked from commit 9d8cda2f54adc0af4abdc1fc9675e7bc9c94228c)
Reviewed-on: https://gerrit.libreoffice.org/5643
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui 
b/sc/uiconfig/scalc/ui/textimportcsv.ui
index 92012ad..45517e4 100644
--- a/sc/uiconfig/scalc/ui/textimportcsv.ui
+++ b/sc/uiconfig/scalc/ui/textimportcsv.ui
@@ -24,10 +24,12 @@
 False
 end
 
-  
-gtk-help
+  
+gtk-ok
 True
 True
+True
+True
 True
 True
   
@@ -52,12 +54,10 @@
   
 
 
-  
-gtk-ok
+  
+gtk-help
 True
 True
-True
-True
 True
 True
   
@@ -702,9 +702,9 @@
   
 
 
-  help
-  cancel
   ok
+  cancel
+  help
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC] Character border, 10. week

[Miklos Vajna]

Hi Tamas,

On Tue, Aug 27, 2013 at 10:57:40AM +0200, Zolnai Tamás 
 wrote:
> In the previous week I've done the next things:
> - Implement border shadow.
> - Finish ODF filter (write OASIS ODF proposal)
> - Write help for character border
> - Fix two bugs:
>- Borders with different styles were merged to one borderline primitive
> (solid-dashed-dotted)
>- The relatively new border line style called "fine dashed", wasn't
> exported/imported into ODF.

Excellent, thanks for these! :-)

> Next weeks, I will work with other filters like DOC, DOCX, RTF and so on.

As we discussed on IRC, HTML filter can also be updated, as that
format supports char borders as well.

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 3 commits - Repository.mk solenv/gbuild testtools/CustomTarget_bridgetest.mk testtools/CustomTarget_uno_test.mk

[Stephan Bergmann]

 Repository.mk |9 +++--
 solenv/gbuild/Library.mk  |2 +-
 solenv/gbuild/platform/IOS_ARM_GCC.mk |1 +
 solenv/gbuild/platform/android.mk |1 +
 solenv/gbuild/platform/solaris.mk |1 +
 solenv/gbuild/platform/unxgcc.mk  |1 +
 testtools/CustomTarget_bridgetest.mk  |3 +++
 testtools/CustomTarget_uno_test.mk|1 +
 8 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit b7b89c9696534d015a7631e959cd03f5e8b29be2
Author: Stephan Bergmann 
Date:   Mon Aug 26 21:24:41 2013 +0200

The testtools component libs are layer NONE, not URELIB

Change-Id: I513ca71792ed9d4010a90041f3f5b818816374c8

diff --git a/Repository.mk b/Repository.mk
index bd8a4ee..f69f10f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -435,6 +435,9 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
smoketest \
subsequenttest \
test \
+   testtools_cppobj \
+   testtools_bridgetest \
+   testtools_constructors \
unobootstrapprotector \
unoexceptionprotector \
unotest \
@@ -608,12 +611,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
pythonloader \
 ))
 
-$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
-   testtools_cppobj \
-   testtools_bridgetest \
-   testtools_constructors \
-))
-
 $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
cppu \
sal \
diff --git a/testtools/CustomTarget_bridgetest.mk 
b/testtools/CustomTarget_bridgetest.mk
index e51601b..a6f8c99 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -31,6 +31,7 @@ 
$(testtools_BRIDGEDIR)/bridgetest_server$(testtools_BATCHSUFFIX) :| $(testtools_
"-s com.sun.star.test.bridge.CppTestObject" \
"-u 
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
"--singleaccept" \
+   "-env:LO_BUILD_LIB_DIR=$(call 
gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \
"-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call 
gb_Rdb_get_outdir_target,uno_services))" \
"-env:URE_MORE_TYPES=$(call 
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
> $@)
@@ -60,6 +61,7 @@ 
$(testtools_BRIDGEDIR)/bridgetest_inprocess_java$(testtools_BATCHSUFFIX) :| $(te
"LD_LIBRARY_PATH=$(OUTDIR)/lib" \
"$(call gb_Executable_get_target_for_build,uno)" \
"-s com.sun.star.test.bridge.BridgeTest" \
+   "-env:LO_BUILD_LIB_DIR=$(call 
gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \
"-env:URE_INTERNAL_JAVA_DIR=file://$(OUTDIR)/bin" \
"-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call 
gb_Rdb_get_outdir_target,uno_services))" \
"-env:URE_MORE_TYPES=$(call 
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
@@ -73,6 +75,7 @@ 
$(testtools_BRIDGEDIR)/bridgetest_client$(testtools_BATCHSUFFIX) :| $(testtools_
echo "$(call gb_Executable_get_target_for_build,uno)" \
"-s com.sun.star.test.bridge.BridgeTest --" \
"-u 
'uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test'" \
+   "-env:LO_BUILD_LIB_DIR=$(call 
gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR))" \
"-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call 
gb_Rdb_get_outdir_target,uno_services))" \
"-env:URE_MORE_TYPES=$(call 
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb)" \
> $@)
diff --git a/testtools/CustomTarget_uno_test.mk 
b/testtools/CustomTarget_uno_test.mk
index 7485890..89e098e 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -22,6 +22,7 @@ $(call gb_CustomTarget_get_target,testtools/uno_test) : \
$(call gb_Executable_get_command,uno) \
-s com.sun.star.test.bridge.BridgeTest \
-- com.sun.star.test.bridge.CppTestObject \
+   -env:LO_BUILD_LIB_DIR=$(call 
gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
-env:URE_MORE_SERVICES=$(call gb_Helper_make_url,$(call 
gb_Rdb_get_outdir_target,uno_services)) \
-env:URE_MORE_TYPES=$(call 
gb_Helper_make_url,$(WORKDIR)/UnoApiTarget/bridgetest.rdb))
 
commit 85561702015659f8943abb23f316a32702b46411
Author: Stephan Bergmann 
Date:   Mon Aug 26 21:23:39 2013 +0200

Introduce LO_BUILD_LIB_DIR for NONE .component files

...instead of reusing LO_LIB_DIR.

Change-Id: Ifb1ea672e35d4bb93a27b64445ecadf4cbe8f647

diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index e8cd313..95d9d2e 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -190,7 +190,7 @@ gb_Library__get_layer_componentprefix = \
 # Make/awk/sed/whatever syntax.
 
 gb_Library__COMPONENTPREFIXES := \
-   

[Libreoffice-commits] core.git: sc/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/textimportcsv.ui |   16 
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 9d8cda2f54adc0af4abdc1fc9675e7bc9c94228c
Author: Caolán McNamara 
Date:   Tue Aug 27 10:39:05 2013 +0100

Resolves: fdo#68555 use (current) consistent ok/cancel/help button order

Change-Id: Id5bb5c48fe82229fe378500d7cacd36d8554707f

diff --git a/sc/uiconfig/scalc/ui/textimportcsv.ui 
b/sc/uiconfig/scalc/ui/textimportcsv.ui
index f34e996..92c8e54 100644
--- a/sc/uiconfig/scalc/ui/textimportcsv.ui
+++ b/sc/uiconfig/scalc/ui/textimportcsv.ui
@@ -24,10 +24,12 @@
 False
 end
 
-  
-gtk-help
+  
+gtk-ok
 True
 True
+True
+True
 True
 True
   
@@ -52,12 +54,10 @@
   
 
 
-  
-gtk-ok
+  
+gtk-help
 True
 True
-True
-True
 True
 True
   
@@ -702,9 +702,9 @@
   
 
 
-  help
-  cancel
   ok
+  cancel
+  help
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - filter/qa include/tools tools/source unusedcode.easy

[Caolán McNamara]

 filter/qa/cppunit/data/tiff/pass/CVE-2013-5575-1.tiff |binary
 include/tools/string.hxx  |1 -
 tools/source/string/tustring.cxx  |   16 
 unusedcode.easy   |1 -
 4 files changed, 18 deletions(-)

New commits:
commit b3b842723518b5c7c6ea86465fe00eed754652f3
Author: Caolán McNamara 
Date:   Tue Aug 27 10:29:31 2013 +0100

test case for CVE-2013-5575/EDB-27875

Change-Id: I43214c3ec840274f120730c1f80ef693859ddae7

diff --git a/filter/qa/cppunit/data/tiff/pass/CVE-2013-5575-1.tiff 
b/filter/qa/cppunit/data/tiff/pass/CVE-2013-5575-1.tiff
new file mode 100644
index 000..ae3cee1
Binary files /dev/null and 
b/filter/qa/cppunit/data/tiff/pass/CVE-2013-5575-1.tiff differ
commit a720ff09d8ee03248865599a691314199925dbf8
Author: Caolán McNamara 
Date:   Tue Aug 27 10:01:19 2013 +0100

Related: fdo#38838 AllocBuffer is now unused

Change-Id: Ib2cf99f3dd9ce5e3acc7364d07d6b6e5d03de423

diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index b70d988..7b8793c 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -276,7 +276,6 @@ public:
 const sal_Unicode*  GetBuffer() const { return mpData->maStr; }
 sal_Unicode*GetBufferAccess();
 voidReleaseBufferAccess( xub_StrLen nLen = STRING_LEN );
-sal_Unicode*AllocBuffer( xub_StrLen nLen );
 
 friend sal_Bool operator == ( const UniString& rStr1,   const 
UniString& rStr2 )
 { return rStr1.Equals( rStr2 ); }
diff --git a/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index 6487eb7..839603e 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.cxx
@@ -265,22 +265,6 @@ void STRING::ReleaseBufferAccess( xub_StrLen nLen )
 mpData->mnLen = nLen;
 }
 
-STRCODE* STRING::AllocBuffer( xub_StrLen nLen )
-{
-DBG_CHKTHIS( STRING, DBGCHECKSTRING );
-
-STRING_RELEASE((STRING_TYPE *)mpData);
-if ( nLen )
-mpData = ImplAllocData( nLen );
-else
-{
-mpData = NULL;
-STRING_NEW((STRING_TYPE **)&mpData);
-}
-
-return mpData->maStr;
-}
-
 STRING& STRING::Insert( STRCODE c, xub_StrLen nIndex )
 {
 DBG_CHKTHIS( STRING, DBGCHECKSTRING );
diff --git a/unusedcode.easy b/unusedcode.easy
index fcf2686..031fdf3 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -77,7 +77,6 @@ SmFontPickList::Contains(Font const&) const
 StatusBar::CopyItems(StatusBar const&)
 StatusBar::HideItems()
 StatusBar::ShowItems()
-String::AllocBuffer(unsigned short)
 SvFileStream::GetFileHandle() const
 SvdProgressInfo::ReportError()
 SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/uiconfig

[Faisal M . Al-Otaibi]

 cui/uiconfig/ui/optmemorypage.ui |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 751b65b246f9adaad314af808940e31050edc642
Author: Faisal M. Al-Otaibi 
Date:   Tue Aug 27 08:20:54 2013 +0300

fix uneditable field in memory option page

this will fix an uneditable "remove from memory after" field

Change-Id: I0b47c4b8082d3244186596a7127f059bbb7214a5
Reviewed-on: https://gerrit.libreoffice.org/5640
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit 93be66f98f3180cbbe358bb5b38f64852a0d30fc)
Reviewed-on: https://gerrit.libreoffice.org/5642
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui
index d8c91b7..2e5a2d8 100644
--- a/cui/uiconfig/ui/optmemorypage.ui
+++ b/cui/uiconfig/ui/optmemorypage.ui
@@ -22,11 +22,6 @@
 1
 10
   
-  
-1
-2359
-10
-  
   
 True
 False
@@ -229,7 +224,6 @@
 True
 True
 •
-adjustment4
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

How to add extra templates to 4.1 windows build

[Flavio Moringa]

I guys,

I'm trying to add a few extra templates to a 4.1 windows build, but I don't
know where to put them on the source dir so that they are caught in the
final MSI

In 3.x I used to put them in "extras/source/premium/templates/lang/en-US/"
but that dir does not exist anymore

Any help?

Thanks


*Flávio Moringa*
Project Leader



Caixa Mágica Software
Energia Open Source
Rua Soeiro Pereira Gomes, Lote 1 - 4.º B,
Edifício Espanha, 1600-196 Lisboa - Portugal
Tel.: +351 217 921 260 Fax: +351 217 921 261
http://www.caixamagica.pt
https://twitter.com/flaviomoringa
https://www.facebook.com/flaviomoringa
http://pt.linkedin.com/in/flaviomoringa
http://people.caixamagica.pt/flaviomoringa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - include/svx include/tools include/vcl rsc/inc rsc/source sc/source sfx2/source svx/source sw/source sw/uiconfig toolkit/source tools/source unusedcode.easy

[Caolán McNamara]

 include/svx/nbdtmg.hxx|2 --
 include/svx/nbdtmgfact.hxx|   14 +++---
 include/tools/rc.h|3 ---
 include/tools/rcid.h  |2 +-
 include/vcl/button.hxx|1 -
 rsc/inc/rscdb.hxx |1 -
 rsc/source/parser/rscicpx.cxx |   19 ---
 rsc/source/parser/rscinit.cxx |6 --
 sc/source/ui/cctrl/checklistmenu.cxx  |6 --
 sc/source/ui/inc/checklistmenu.hxx|1 -
 sfx2/source/sidebar/SidebarController.cxx |   19 ---
 sfx2/source/sidebar/SidebarController.hxx |1 -
 svx/source/sidebar/nbdtmg.cxx |   26 --
 svx/source/sidebar/nbdtmgfact.cxx |   13 +
 sw/source/ui/fldui/fldpage.cxx|   16 
 sw/source/ui/fldui/fldpage.hxx|4 
 sw/source/ui/inc/condedit.hxx |1 -
 sw/source/ui/inc/numfmtlb.hxx |4 
 sw/source/ui/utlui/condedit.cxx   |8 
 sw/source/ui/utlui/numfmtlb.cxx   |   16 
 sw/uiconfig/swriter/ui/paradialog.ui  |   24 
 toolkit/source/awt/vclxtoolkit.cxx|5 -
 toolkit/source/helper/unowrapper.cxx  |1 -
 tools/source/rc/resmgr.cxx|1 -
 unusedcode.easy   |7 ---
 vcl/source/app/dbggui.cxx |9 +
 vcl/source/control/button.cxx |   14 --
 vcl/source/window/window.cxx  |1 -
 28 files changed, 26 insertions(+), 199 deletions(-)

New commits:
commit 7c542bf0daf49f6c733d3f0af0f6e4dee6928479
Author: Caolán McNamara 
Date:   Tue Aug 27 09:31:02 2013 +0100

rearrange paragraph tabs back to classic order

if the intent was to intentionally reorder them then also keep the paragraph
style dialog tabs in the same order as well

Change-Id: I4bd69d49099b7921b021739482d0c72b07639882

diff --git a/sw/uiconfig/swriter/ui/paradialog.ui 
b/sw/uiconfig/swriter/ui/paradialog.ui
index 8cc68b7..6c4baf7 100644
--- a/sw/uiconfig/swriter/ui/paradialog.ui
+++ b/sw/uiconfig/swriter/ui/paradialog.ui
@@ -104,10 +104,11 @@
   
 
 
-  
+  
 True
 False
-Asian 
Typography
+0.469988079071
+Alignment
   
   
 1
@@ -118,10 +119,11 @@
   
 
 
-  
+  
 True
 False
-Outline & 
Numbering
+0.4600834465027
+Text Flow
   
   
 2
@@ -132,10 +134,10 @@
   
 
 
-  
+  
 True
 False
-Tabs
+Asian 
Typography
   
   
 3
@@ -146,11 +148,10 @@
   
 
 
-  
+  
 True
 False
-0.469988079071
-Alignment
+Outline & 
Numbering
   
   
 4
@@ -161,11 +162,10 @@
   
 
 
-  
+  
 True
 False
-0.4600834465027
-Text Flow
+Tabs
   
   
 5
commit f00cd93a66a6cf236114e810b1470e562315b777
Author: Caolán McNamara 
Date:   Tue Aug 27 09:16:59 2013 +0100

callcatcher: update unused code, esp unused Resource based ctor

e.g. no ImageRadioButton is now loaded from any res/rsc file, so
that ctor and associated code paths can be stripped out

Change-Id: Ic4cf19d45adb7c734f150e0b89eef193157a74a7

diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index ae3e6c3..b98fa59 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -310,7 +310,6 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase
 static MixBulletsTypeMgr* _instance;
 public:
 MixBulletsTypeMgr(const NBOType aType);
-MixBulletsTypeMgr(const NBOType aType,const SfxItemSet* pArg);
 MixBulletsTypeMgr(const MixBulletsTypeMgr& aTypeMgr);
 virtual ~MixBulletsTypeMgr() {}
 virtual void Init();
@@ -340,7 +339,6 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase
 static NumberingTypeMgr*_instance;
 public:
 NumberingTypeMgr(const NBOType aType);
-NumberingTypeMgr(const NBOType aType,const SfxItemSet* pArg);
 NumberingTypeMgr(const NumberingTypeMgr& aTypeMgr);
 virtual ~NumberingTypeMgr() {}
 vir

[Libreoffice-commits] core.git: cui/uiconfig

[Faisal M . Al-Otaibi]

 cui/uiconfig/ui/optmemorypage.ui |6 --
 1 file changed, 6 deletions(-)

New commits:
commit 93be66f98f3180cbbe358bb5b38f64852a0d30fc
Author: Faisal M. Al-Otaibi 
Date:   Tue Aug 27 08:20:54 2013 +0300

fix uneditable field in memory option page

this will fix an uneditable "remove from memory after" field

Change-Id: I0b47c4b8082d3244186596a7127f059bbb7214a5
Reviewed-on: https://gerrit.libreoffice.org/5640
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/uiconfig/ui/optmemorypage.ui b/cui/uiconfig/ui/optmemorypage.ui
index c705854..a7dad6b 100644
--- a/cui/uiconfig/ui/optmemorypage.ui
+++ b/cui/uiconfig/ui/optmemorypage.ui
@@ -22,11 +22,6 @@
 1
 10
   
-  
-1
-2359
-10
-  
   
 True
 False
@@ -229,7 +224,6 @@
 True
 True
 •
-adjustment4
   
   
 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Character border, 10. week

[Zolnai Tamás]

Hi All,

In the previous week I've done the next things:
- Implement border shadow.
- Finish ODF filter (write OASIS ODF proposal)
- Write help for character border
- Fix two bugs:
   - Borders with different styles were merged to one borderline primitive
(solid-dashed-dotted)
   - The relatively new border line style called "fine dashed", wasn't
exported/imported into ODF.

Next weeks, I will work with other filters like DOC, DOCX, RTF and so on.

Best regards,
Tamás
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: test/Package_unittest.mk test/user-template

[Stephan Bergmann]

 test/Package_unittest.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 26f34f89d98e32bbef0489c64d5ca6c3278ce8c8
Author: Stephan Bergmann 
Date:   Tue Aug 27 10:17:09 2013 +0200

Make sure unittest/user/config/soffice.cfg/ exits

...otherwise PresetHandler::getOrCreateRootStorageShare
(framework/source/accelerators/presethandler.cxx) will cause a
com.sun.star.io.IOException: "URL
"file:///.../solver/unxlngx6/unittest/user/config/soffice.cfg" passed to
css.embed.FileSystemStorageFactory.createInstanceWithArguments does not 
denote
an existing directory" in some CppunitTests.  (And
1eecb8df22b77a6982601bf877067a685d913a7d "Some cleanup and consolidation of 
the
Impress layout work" removed the last file that got definitely created in 
that
directory from test/Package_unittest.mk.)

Change-Id: Idbe42fdd6b06194781cceef62c50531ce0e1c706

diff --git a/test/Package_unittest.mk b/test/Package_unittest.mk
index 6edfc9c..cbab559 100644
--- a/test/Package_unittest.mk
+++ b/test/Package_unittest.mk
@@ -18,6 +18,7 @@ $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/tem
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/standard.bau,user/autotext/en-US/standard.bau))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/autotext/en-US/crdbus50.bau,user/autotext/en-US/crdbus50.bau))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/config/psetup.xpm,user/config/psetup.xpm))
+$(eval $(call 
gb_Package_add_file,test_unittest,unittest/user/config/soffice.cfg/.dummy,empty-directory-dummy))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/transitions.xml,user/config/soffice.cfg/simpress/transitions.xml))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/transitions-ogl.xml,user/config/soffice.cfg/simpress/transitions-ogl.xml))
 $(eval $(call 
gb_Package_add_file,test_unittest,unittest/install/share/config/soffice.cfg/simpress/effects.xml,user/config/soffice.cfg/simpress/effects.xml))
diff --git a/test/user-template/empty-directory-dummy 
b/test/user-template/empty-directory-dummy
new file mode 100644
index 000..e69de29
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: eot embedded fonts

[Brennan T Vincent]

Sure, I can work on the libreoffice integration myself. Pointers would be
good :)


On Tue, Aug 27, 2013 at 12:15 AM, Jan Holesovsky  wrote:

> Hi Brennan,
>
> Brennan T Vincent píše v Po 26. 08. 2013 v 21:23 -0700:
>
> > One of the most commonly-occurring problems with .pub import is the
> > fact that we don't respect embedded fonts. Now that LibreOffice
> > supports embedded fonts, it should be possible to make this work.
> >
> > A few questions:
> >
> > (1) Do we support Embedded OpenType fonts currently? (.eot)
> >
> > (2) If not (which I suspect), I can contribute some code to do this.
> > Microsoft and Monotype recently granted a perpetual, irrevocable free
> > patent and copyright license to implement the .eot format, so there
> > should be no legal issues. I have written a C library to convert
> > from .eot to .ttf and would like to know who to talk to in order to
> > get this included in LibreOffice.
>
> This is so cool, thanks for that! :-)  Lubos [CC'd] has implemented the
> font embedding, and actually impossibility of reading .eot was blocking
> the PPTX font embedding implementation.  He has invested some time into
> reading .eot, but did not finish that IIRC.
>
> > I can provide more details if anyone is interested.
>
> That would be awesome - where does the code of your library live,
> please?  Are you willing to do the LibreOffice integration part
> yourself? - Lubos would provide you with the code pointers in that case.
>
> All the best,
> Kendy
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: eot embedded fonts

[Jan Holesovsky]

Hi Brennan,

Brennan T Vincent píše v Po 26. 08. 2013 v 21:23 -0700:

> One of the most commonly-occurring problems with .pub import is the
> fact that we don't respect embedded fonts. Now that LibreOffice
> supports embedded fonts, it should be possible to make this work.
> 
> A few questions:
>
> (1) Do we support Embedded OpenType fonts currently? (.eot)
> 
> (2) If not (which I suspect), I can contribute some code to do this.
> Microsoft and Monotype recently granted a perpetual, irrevocable free
> patent and copyright license to implement the .eot format, so there
> should be no legal issues. I have written a C library to convert
> from .eot to .ttf and would like to know who to talk to in order to
> get this included in LibreOffice.

This is so cool, thanks for that! :-)  Lubos [CC'd] has implemented the
font embedding, and actually impossibility of reading .eot was blocking
the PPTX font embedding implementation.  He has invested some time into
reading .eot, but did not finish that IIRC.

> I can provide more details if anyone is interested.

That would be awesome - where does the code of your library live,
please?  Are you willing to do the LibreOffice integration part
yourself? - Lubos would provide you with the code pointers in that case.

All the best,
Kendy

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: About erasing iterators (ohierarchyholder.cxx, package module)

[Jan Holesovsky]

Hi Julien,

julien2412 píše v Po 26. 08. 2013 v 21:41 -0700:

> I'm taking a look to the use of erase on iterators.
> I found this example:
> 289 void OHierarchyElement_Impl::RemoveElement( const ::rtl::Reference<
> OHierarchyElement_Impl >& aRef )
> 290 {
> 291 {
> 292 ::osl::MutexGuard aGuard( m_aMutex );
> 293 OHierarchyElementList_Impl::iterator aIter =
> m_aChildren.begin();
> 294 const OHierarchyElementList_Impl::const_iterator aEnd =
> m_aChildren.end();
> 295 while (aIter != aEnd)
> 296 {
> 297 if (aIter->second == aRef )
> 298 aIter = m_aChildren.erase(aIter);
> 299 else
> 300 ++aIter;
> 301 }
> 302 }
> See
> http://opengrok.libreoffice.org/xref/core/package/source/xstor/ohierarchyholder.cxx#298
> 
> Is it ok to use "aEnd" or, since erase may  be called, we should change the
> while into:
> while (aIter != m_aChildren.end())
> (and remove aEnd)

In this exact case (when the value may be present more times in the
vector), you might want to use the Erase-remove idiom [1]:

// remove all occurrences of aRef 
m_aChildren.erase(std::remove(m_aChildren.begin(), m_aChildren.end(), aRef), 
m_aChildren.end());

Even with the comment I suppose, so that people who haven't read tons of
C++ books can see what's going on ;-)

> Another thing: couldn't we break the loop after erase or could aRef be
> present several times?

Not sure - worth checking the history of that file I think.

[1] http://en.wikipedia.org/wiki/Erase-remove_idiom

Regards,
Kendy

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice