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

2013-11-01 Thread Noel Grandin
 connectivity/source/drivers/mozab/MResultSet.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ccbea814840ae8bc7cd5ad7e5d61a90638403236
Author: Noel Grandin n...@peralex.com
Date:   Fri Nov 1 08:43:24 2013 +0200

fix mozab driver after OUString change

for Windows build after my change in
commit e2451bd729d0f1d795a5b689deba65bc4e9d92c6
Convert indexOf-startsWith and lastIndexOf-endsWith

Change-Id: I9397f1310742cdd773a7d2d3c5f0dbe728041d2d

diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx 
b/connectivity/source/drivers/mozab/MResultSet.cxx
index 15d99ce..845ba0e 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -743,6 +743,10 @@ void OResultSet::parseParameter( const OSQLParseNode* 
pNode, OUString rMatchStr
 #endif
 }
 
+#define WILDCARD %
+#define ALT_WILDCARD *
+static const sal_Unicode MATCHCHAR = '_';
+
 void OResultSet::analyseWhereClause( const OSQLParseNode* 
parseTree,
  MQueryExpression 
queryExpression)
 {
@@ -894,10 +898,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*  
   parseT
 m_pStatement-getOwnConnection()-throwSQLException( 
STR_QUERY_INVALID_LIKE_STRING, *this );
 }
 
-const sal_Unicode WILDCARD = '%';
-const sal_Unicode ALT_WILDCARD = '*';
-const sal_Unicode MATCHCHAR = '_';
-
 OUString sTableRange;
 if(SQL_ISRULE(pColumn,column_ref))
 m_pSQLIterator-getColumnRange(pColumn,columnName,sTableRange);
@@ -917,7 +917,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*   
  parseT
 
 // Determine where '%' character is...
 
-if ( matchString.equals( OUString( WILDCARD ) ) )
+if ( matchString.equals( WILDCARD ) )
 {
 // String containing only a '%' and nothing else
 op = MQueryOp::Exists;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Tor Lillqvist
 solenv/gbuild/platform/IOS_ARM_GCC.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit faf9aa674e37d8d51771d5506a1ddbe3d4974915
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 1 08:52:04 2013 +0200

Add FREEHAND_LIBS

Change-Id: I86d01c9afdedc2477c2894694ab04c4a493bfa65

diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 19f3aa4..4486065 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -118,6 +118,7 @@ define gb_LinkTarget__command_dynamiclink
$(foreach lib,$(LINKED_STATIC_LIBS),$(call 
gb_StaticLibrary_get_target,$(lib))) \
$(call gb_LinkTarget__get_liblinkflags,$(LINKED_LIBS)) \
$(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \
+   $(FREEHAND_LIBS) \
$(HUNSPELL_LIBS) \
$(HYPHEN_LIB) \
$(MYTHES_LIBS) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: 2 commits - android/Bootstrap android/experimental

2013-11-01 Thread Tor Lillqvist
 android/Bootstrap/Makefile.shared|1 
 android/experimental/LibreOffice4Android/dummies.cxx |   31 +++
 android/experimental/desktop/dummies.cxx |   30 ++
 3 files changed, 62 insertions(+)

New commits:
commit 9b629f296732e8da630efe95321d9b1769b17a2f
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 1 08:59:03 2013 +0200

Add (dummy) touch_ui_dialog_modal() implementations

Change-Id: I12fde9cc7180118ade39b7a037d05e8793bd1c12

diff --git a/android/experimental/LibreOffice4Android/dummies.cxx 
b/android/experimental/LibreOffice4Android/dummies.cxx
index 89766e8..5607ecf 100644
--- a/android/experimental/LibreOffice4Android/dummies.cxx
+++ b/android/experimental/LibreOffice4Android/dummies.cxx
@@ -11,6 +11,8 @@
 // that the LO layer calls. As this experimental Android app doesn't
 // handle any of that, these do nothing.
 
+#include android/log.h
+
 #include touch/touch.h
 
 extern C
@@ -41,4 +43,33 @@ touch_ui_selection_none()
 {
 }
 
+
+static const char *
+dialog_kind_to_string(MLODialogKind kind)
+{
+switch (kind) {
+case MLODialogMessage:
+return MSG;
+case MLODialogInformation:
+return INF;
+case MLODialogWarning:
+return WRN;
+case MLODialogError:
+return ERR;
+case MLODialogQuery:
+return QRY;
+default:
+return WTF;
+}
+}
+
+extern C
+__attribute__ ((visibility(default)))
+MLODialogResult
+touch_ui_dialog_modal(MLODialogKind kind, const char *message)
+{
+__android_log_print(ANDROID_LOG_INFO, ===  %s: %s, 
dialog_kind_to_string(kind), message);
+return MLODialogOK;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/android/experimental/desktop/dummies.cxx 
b/android/experimental/desktop/dummies.cxx
index 89766e8..f89009a 100644
--- a/android/experimental/desktop/dummies.cxx
+++ b/android/experimental/desktop/dummies.cxx
@@ -11,6 +11,8 @@
 // that the LO layer calls. As this experimental Android app doesn't
 // handle any of that, these do nothing.
 
+#include android/log.h
+
 #include touch/touch.h
 
 extern C
@@ -41,4 +43,32 @@ touch_ui_selection_none()
 {
 }
 
+static const char *
+dialog_kind_to_string(MLODialogKind kind)
+{
+switch (kind) {
+case MLODialogMessage:
+return MSG;
+case MLODialogInformation:
+return INF;
+case MLODialogWarning:
+return WRN;
+case MLODialogError:
+return ERR;
+case MLODialogQuery:
+return QRY;
+default:
+return WTF;
+}
+}
+
+extern C
+__attribute__ ((visibility(default)))
+MLODialogResult
+touch_ui_dialog_modal(MLODialogKind kind, const char *message)
+{
+__android_log_print(ANDROID_LOG_INFO, ===  %s: %s, 
dialog_kind_to_string(kind), message);
+return MLODialogOK;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 354c1a99ea29e41dd948600071ccc6215d77c29a
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 1 08:58:38 2013 +0200

Add FREEHAND_LIBS

Change-Id: I0230a18aaf5c8c9fe9f55a137cc62cbfc3992d42

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index 20d1c0c..657e433 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -83,6 +83,7 @@ LIBS = \
   -Wl,--start-group \
   $(wildcard $(INSTDIR)/$(LIBO_LIB_FOLDER)/lib*.a) \
   $(wildcard $(WORKDIR)/LinkTarget/StaticLibrary/lib*.a) \
+  $(FREEHAND_LIBS) \
   $(HARFBUZZ_LIBS) \
   $(HUNSPELL_LIBS) \
   $(HYPHEN_LIB) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Stephan Bergmann
 framework/source/loadenv/loadenv.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 5a10e33f4ddc718f05a64629c4133a607ec9b29e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 1 09:00:17 2013 +0100

Improve exception messages (for debugging)

Change-Id: Id2e00e0b0363c58c88585dd15f34156e57a7aaac

diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index d3b67e9..10c85f6 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -404,7 +404,8 @@ void LoadEnv::startLoading()
 // not started = general error
 // We can't say - what was the reason for.
 if (!bStarted)
-throw LoadEnvException(LoadEnvException::ID_GENERAL_ERROR);
+throw LoadEnvException(
+LoadEnvException::ID_GENERAL_ERROR, not started);
 }
 
 /*---
@@ -1698,7 +1699,9 @@ void LoadEnv::impl_reactForLoadingState()
 if (bThrow)
 {
 if  ( aRequest.isExtractableTo( ::cppu::UnoType css::uno::Exception 
::get() ) )
-throw LoadEnvException( LoadEnvException::ID_GENERAL_ERROR, , 
aRequest );
+throw LoadEnvException(
+LoadEnvException::ID_GENERAL_ERROR, interaction request,
+aRequest);
 }
 
 // - SAFE --
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Compiling LibreOffice 4.1.2.3 on Solaris

2013-11-01 Thread Stephan Bergmann

On 10/31/2013 01:25 PM, Eric Bautsch wrote:

I'm trying to compile LibreOffice 4.1.2.3 on Solaris 12 (build 26,
currently).

Note: don't get excited, I'm doing this in my spare time and Oracle
are in no way endorsing, supporting, or anything else'ing my efforts.

I've been using this thread for assistance and it's been a great help:
http://comments.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/51422


Note that traditionally OOo had been building/working very well on 
Solaris, but these days there's only very little and seemingly 
occasional initiative to keep that up.  Therefore, Solaris-specific code 
in LO likely keeps rotting over time.


At runtime, the idlc executable needs the libuno_sal.so.3 dynamic 
library to resolve the rtl_string_new symbol (and others).  Therefore, 
idlc contains an RPATH (see readelf -d solver/unxsogi.pro/bin/idlc) so 
that it finds it *in an installation* ($ORIGIN/../../ure-link/lib, 
where in an installation idlc is in sdk/bin/ and libuno_sal.so.3 is in 
ure-link/lib/).


However, idlc is also called during the build, where idlc is in 
solver/unxsogi.pro/bin/ and libuno_sal.so.3 is in 
solver/unxsogi.pro/lib/.  To make that work, idlc is called with an 
LD_LIBRARY_PATH that contains solver/unxsogi.pro/lib during the build. 
This is taken care of towards the end of 
solenv/gbuild/platform/com_GCC_defs.mk (gb_Helper_set_ld_path) and 
should work for Solaris.


To see what's going wrong, run make VERBOSE=t to see the command line 
of how exactly idlc is called to [build IDL] udkapi/com/sun/star/idl.


Stephan


I'm currently struggling with getting a working idlc compiled. Here's
what happens:

[build IDL] udkapi/com/sun/star/idl
ld.so.1: idlc: fatal: relocation error: file

/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/bin/idlc:
symbol rtl_string_new: referenced symbol not found
/bin/sh: line 1: 8411: Killed
make[1]: ***

[/export/home/bautsche/libre-office/libreoffice-4.1.2.3/workdir/unxsogi.pro/UnoApiPartTarget/udkapi/com/sun/star/idl.done]
Killed
gmake: *** [build] Error 2
bautsche@cressida $

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


LibreOffice Gerrit News for core on 2013-11-01

2013-11-01 Thread gerrit
Moin!

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

+ Windows: Set minimum Windows SDK to 0x0502 (Windows XP SP2)
  in https://gerrit.libreoffice.org/6496 from Thomas Arnhold
+ windows: check for _WIN32 not WIN32
  in https://gerrit.libreoffice.org/6490 from Thomas Arnhold
+ i#118517# - Update twain to version 2.1 with support for Apple and UNIX.
  in https://gerrit.libreoffice.org/6508 from Thomas Arnhold
+ Save Image-Crop information in docx for PNG
  in https://gerrit.libreoffice.org/6507 from Pallavi Jadhav
+ Save Image-Crop information in docx
  in https://gerrit.libreoffice.org/6240 from Pallavi Jadhav
+ document the use of the strtmpl.cxx and remove unnecessary macro usage
  in https://gerrit.libreoffice.org/6504 from Noel Grandin
+ fdo#60698: Unify spl and spl_unx
  in https://gerrit.libreoffice.org/6503 from Marcos Souza
+ Unit test for Docx Chart Series Name
  in https://gerrit.libreoffice.org/6502 from Vinaya Mandke


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

+ fdo#71008 add Excel 2010 functions BETA.DEST and BETA.INV
  in https://gerrit.libreoffice.org/6505 from Winfried Donkers
+ solver doesn't solve anything...
  in https://gerrit.libreoffice.org/6515 from Michael Stahl
+ sw/qa: adapt ooxmlexport to use new tests macros
  in https://gerrit.libreoffice.org/6513 from Pierre-Eric Pelloux-Prayer
+ BIPU Freehand importer
  in https://gerrit.libreoffice.org/6511 from Fridrich Strba
+ Fixe project for Xcode5 iOS7 new solver changes
  in https://gerrit.libreoffice.org/6514 from Roi Illouz
+ Build only what is needed: less probability to mess up
  in https://gerrit.libreoffice.org/6512 from Fridrich Strba
+ bundle libfreehand
  in https://gerrit.libreoffice.org/6510 from Fridrich Strba
+ fix incorrect strings for calc functions STDEVP and STDEV.P
  in https://gerrit.libreoffice.org/6506 from Winfried Donkers
+ sw/qa: 1 individual unit test per filter (import/export) test
  in https://gerrit.libreoffice.org/6289 from Pierre-Eric Pelloux-Prayer
+ Convert indexOf-startsWith and lastIndexOf-endsWith
  in https://gerrit.libreoffice.org/6435 from Noel Grandin


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

+ COMPHELPER: Specific unit test for empty comments in SyntaxHighlight
  in https://gerrit.libreoffice.org/6452 from Arnaud Versini


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

+ Make ./autogen.sh --help work again
  in https://gerrit.libreoffice.org/6100 from Arnaud Versini
+ Make libatomic_ops buildable and enable on non-X86.
  in https://gerrit.libreoffice.org/5812 from Andrzej J.R. Hunt
+ Increase number of remembered recent documents from 10 to 25
  in https://gerrit.libreoffice.org/6101 from Krisztian Pinter
+ startcenter: Make SC open faster by timeouting thumbnails
  in https://gerrit.libreoffice.org/6102 from Krisztian Pinter
+ Remove old outdated gallery images and sounds
  in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt
+ Remove more unusedcode
  in https://gerrit.libreoffice.org/5937 from Marcos Souza
+ Simplify oslThreadIdentifier on Linux 32.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ Dynamically align toolbars in LibreOffice
  in https://gerrit.libreoffice.org/5655 from Prashant Pandey
+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ more debug logs, extra debug layer, file is not used in p3k
  in https://gerrit.libreoffice.org/5267 from James Michael Dupont
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn
+ fdo#64817 : fix for rectangle with image fill
  in https://gerrit.libreoffice.org/4718 from Adam CloudOn


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


Why does chart_StarOffice_XML_Chart not have a DetectService?

2013-11-01 Thread Stephan Bergmann
With the current Keynote filter's detectVersionFromInput (libetonyek 
src/lib/KEYDocument.cpp) being too imprecise and causing 
JunitTest_chart2_unoapi to fail when that tries to load 
chart2/qa/unoapi/testdocuments/TransparencyChart.sxs, I (re-?) 
discovered that 
filter/source/config/fragments/types/chart_StarOffice_XML_Chart.xcu does 
not specify a DetectService.


In TypeDetection::queryTypeByDescriptor 
(filter/source/config/cache/typedetection.cxx) 
chart_StarOffice_XML_Chart is sorted to the head of lFlatTypes due the 
matching sxs extension, but in the following 
TypeDetection::impl_detectTypeFlatAndDeep, the missing DetectionService 
for chart_StarOffice_XML_Chart causes impress_AppleKeynote, which comes 
later in lFlatTypes but does have an (over-eager) DetectService, to win.


Does anybody happen to have any insight why there is no DetectService 
for chart_StarOffice_XML_Chart (when the dozen other 
filter/source/config/fragments/types/*_StarOffice_*.xcu each specify one)?


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


Jordan sneakers not only income the actual technology, and gross sales sporting activities soul

2013-11-01 Thread cloud


Out of primary set of Jordan shoes or boots to help fresh launched Lebron 6
V2 Miami Evening, the particular building of Nike firm has been more than
SIXTY a long time. From the working area to help overseas firm, Nike
possesses develop just about all their solutions to soccer cleats, club
along with running shoes or boots, continue to currently, hockey sneakers
usually are signal while internal with  air jordan 4 for sale cheap
http://www.lebronshoes2013price.com/air-jordan-shoes/air-jordan-4  
organization.

Recognition involving Air Jordan 2011 showed clearly the actual success
report regarding Jordan. Michael jordan Jeffrey Jordan may be quickly argued
the highest field hockey player actually to play the game. Yes Costs Russell
been able to help get a lot more shining happens to be beneath his or her
appoint, Wilt Chamberlain have scored far more details in one adventure in
addition to Julius Erving required the sport for the air flow just before 
air jordans for sale online
http://www.lebronshoes2013price.com/air-jordan-shoes   ever before
managed. Nevertheless Jordan was in a total little league of his / her very
own. Their effect appeared to be were feeling besides in the way the game
appeared to be trialled, nevertheless with the way ıt had been defined
around the world. Finally, his / her flawlessness with their activity ended
up being a key around catapulting that attractiveness regarding golf ball
plus the Countrywide Basketball Acquaintance in many countries This sort of
will be fullness on this player that her personal bank Air Jordans : and
also the collection regarding his or her personal bank shoes coming from
Nike : are actually some sort of top-seller even after her FIFTEEN time of
year employment. Zero consider people today each previous in addition to
younger obtain Jordan shoes or boots.


It's the material of any tutor along with a story. Along with somehow, some
people really feel for instance they will carry out what exactly Jordan are
able to do when ever he is putting on and then. Nevertheless a number of
people invest in Jordan kicks not because the love with the activity,
nevertheless owing to their own aesthetical benefit. Jordan  adidas rose 3.5
review http://www.lebronshoes2013price.com/adidas-rose/adidas-rose-3-5  ,
mainly through his / her occasion considering the Chicago Bulls is this
rendering connected with elegance plus style : staying the very first you to
definitely sport any shaven travel as well as baggy shorts. The following
MVP fine quality battler knows that comfort and ease just isn't the one
factor this makes a difference. And her shoes or boots all of the a lot more
created him look good any time they have upward while in the surroundings.
It truly is really tricky to envision how one particular man possesses
revolutionized the game with basketball : through the time period your dog
painted his / her initial Air Jordan kicks, some sort of red set trainer in
whose colour seemed to be as soon as forbidden within the NBA to be able to
his or her 2nd three-peat. Simply no different basketball person provides
got a lot more unsecured personal boots and shoes as compared to your pet.

Actually many people examine Kobe Bryant and Kobe Footwear together with
Jordan, these people even now trust Jordan as the finest golf ball gamer
inside the NBA. Actually Kobe Bryant experimented with her very best to help
break out that score with Jordan, however, however now, Jordan is always the
top end YOU hockey battler while in the playoff. When Nike brand new
unveiled Kobe Footwear to get Kobe enthusiasts, a great deal of enthusiasts
all determined upon  jordan fly wade 2 for sale
http://www.lebronshoes2013price.com/jordan-fly-wade/jordan-fly-wade-2  
set, actually advertisement advertise of which Kobe VI will increase
acceleration, coloring. Although now, the actual charm associated with
Jordan footwear are not able to separate through.

That built Jordan sneakers and so common, statistic Nike Shoes or boots
gross sales really, this income involving Jordan footwear cutting-edge track
record electronic digital. The most effective model is Lebron John, very
last time of year direct Miami Temperature in order to last, ahead of  nike
air penny v for sale
http://www.lebronshoes2013price.com/nike-air-penny/nike-air-penny-5  
specialist pattern Lebron footwear to get James, he often damaged Weather
Jordan most seasons. As the model pertaining to teens, adventure associated
with Michael Jordan likewise encourage learners to build the desires
sometime soon! As well as, Jordan shoes or boots not merely gross sales your
know-how, but also income sports activities spirit.



--
View this message in context: 
http://nabble.documentfoundation.org/Jordan-sneakers-not-only-income-the-actual-technology-and-gross-sales-sporting-activities-soul-tp4080709.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list

In a perception, Ugg shoes are usually seriously exceptional choice

2013-11-01 Thread cloud


Also, this multi-colored modifications regarding Ugg  booties  in addition
to boots or shoes are fairly critical element when using the recognition.
You can discover away any kind of design footwear in addition to  ugg boots
cheap http://www.uggsonlinecheapoutlet.com/   from Ugg which will
encompass Ugg Vintage, Ugg Ultra, Ugg House shoes and Ugg Flip flops. Also,
moreover , you may could pick any kind of colours via pink, charcoal,
lamination shade and also dim colour matching for your hobbies in addition
to kinds. For you to let you know the reality, Ugg  booties  tend to be
actually correctly going along with every together with your costumes which
in turn include skirts, foodies, skinny jeans and the like.

In a perception, Ugg shoes are usually seriously exceptional choice. You'll
be able to pick a person's almost all right  ugg boots ireland
http://www.uggsonlinecheapoutlet.com/   from some of our web site retail
store in predicament you need to obtain a single. Were convinced mail a pair
to match the needs you have within circumstance everyone get 2 pairs
regarding Ugg boots as well as shoes or boots.

Since almost all individuals recognize in which Ugg boots tend to be
acquiring a wonderful present a whole bunch much more and a superb offer a
lot far more well-known and a exceptional present a whole bunch a lot more
along with a fantastic offer much much more individuals plus women invest in
as well as placed on Ugg shoes even they are going to providing price our
big capital. Ugg  ugg ireland sale http://www.uggsonlinecheapoutlet.com/  
are not only enjoyable to conserve ft nice and also cool to generate you
design with this uninteresting time of year. Therefore, caring for our own
Ugg footwear is definitely relatively important!

Ugg  booties  are created with sheepskin, which usually are sometimes
reasonably subtle content. All these footwear can't be placed within really
humid atmosphere just like rainfall or maybe snow. They're just designed to
maintain a person's foot hot, but they aren't made having water-resistant.
Your relatively most interesting period with regard to Ugg  ugg ireland shop
http://www.uggsonlinecheapoutlet.com/   is actually through the fall or
maybe originate following a environment is actually stunning nevertheless
precipitation is usually minimal.

Typically after you pay for a couple of fresh Ugg footwear in addition to 
ugg boots sale http://www.uggsonlinecheapoutlet.com/  , they are going to
look using distinct laundry medication regulations and/or products. Even so,
whenever they just don't, an individual certainly should rinse these folks
by hand possessing some sort of lowest level of chilly waters. That they
certainly should by absolutely no signifies possibly be situated through the
cleaning supplies neither absolutely need to some people possibly be
cleansed by using beautiful mineral water.



--
View this message in context: 
http://nabble.documentfoundation.org/In-a-perception-Ugg-shoes-are-usually-seriously-exceptional-choice-tp4080710.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] core.git: qadevOOo/tests

2013-11-01 Thread Stephan Bergmann
 qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java |   46 +--
 1 file changed, 28 insertions(+), 18 deletions(-)

New commits:
commit baa68e4e89c81b20f79576734cdbfa63665b3ff5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 1 09:41:30 2013 +0100

Try make this more robust in slow environments

...where the previous .uno:PrintPreview request has not yet been processed, 
the
same way it had been made more robust for ScAccessiblePageHeader.java in
5b5c52a3a4d048bba8c18dfb06ffca25c670d099 Try make this more robust in slow
environments plus b5dd2b4218f966e177d880bcc29fa5fba3bfe1c1 Also cope with
intermittend DisposedExceptions.

Change-Id: I64389b817d91a2bed8dfe1b8d92bafec42eba21a

diff --git a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java 
b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
index e0897dd..d56f8e8 100644
--- a/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
+++ b/qadevOOo/tests/java/mod/_sc/ScAccessiblePreviewCell.java
@@ -37,6 +37,7 @@ import com.sun.star.frame.XController;
 import com.sun.star.frame.XDispatch;
 import com.sun.star.frame.XDispatchProvider;
 import com.sun.star.frame.XModel;
+import com.sun.star.lang.DisposedException;
 import com.sun.star.lang.XComponent;
 import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sheet.XSpreadsheet;
@@ -109,8 +110,6 @@ public class ScAccessiblePreviewCell extends TestCase {
  * Obtains the accessible object for a one of cell in preview mode.
  */
 protected synchronized TestEnvironment 
createTestEnvironment(TestParameters Param, PrintWriter log) {
-
-XInterface oObj = null;
 XCell xCell = null;
 
 try {
@@ -160,14 +159,33 @@ public class ScAccessiblePreviewCell extends TestCase {
 throw new StatusException(Status.failed(Couldn't change mode));
 }
 
-shortWait();
-
-AccessibilityTools at = new AccessibilityTools();
-
-XWindow xWindow = 
AccessibilityTools.getCurrentWindow((XMultiServiceFactory)Param.getMSF(), 
xModel);
-XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
-
-oObj = AccessibilityTools.getAccessibleObjectForRole(xRoot, 
AccessibleRole.TABLE_CELL, true);
+XInterface oObj = null;
+for (int i = 0;; ++i) {
+try {
+Thread.sleep(500);
+} catch (InterruptedException e) {
+throw new RuntimeException(e);
+}
+try {
+XAccessible xRoot = AccessibilityTools.getAccessibleObject(
+AccessibilityTools.getCurrentWindow(
+(XMultiServiceFactory) Param.getMSF(), xModel));
+if (xRoot != null) {
+oObj = AccessibilityTools.getAccessibleObjectForRole(
+xRoot, AccessibleRole.TABLE_CELL, true);
+if (oObj != null) {
+break;
+}
+}
+} catch (DisposedException e) {
+log.println(Ignoring DisposedException);
+}
+if (i == 20) { // give up after 10 sec
+throw new RuntimeException(
+Couldn't get AccessibleRole.TABLE_CELL object);
+}
+log.println(No TABLE_CELL found yet, retrying);
+}
 
 log.println(ImplementationName  + utils.getImplName(oObj));
 
@@ -182,12 +200,4 @@ public class ScAccessiblePreviewCell extends TestCase {
 
 return tEnv;
 }
-
-protected void shortWait() {
-try {
-Thread.sleep(1000) ;
-} catch (InterruptedException e) {
-System.out.println(While waiting : + e);
-}
-}
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Caolán McNamara
 basic/source/classes/propacc.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 609f0b8bff60104168cab54822d3e7643a6f10cb
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 08:54:20 2013 +

add limits.h for rhel-6 build

Change-Id: I9d355be54eb4072044ad660296375fca8d0fa831

diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx
index 166a07e..7fd2097 100644
--- a/basic/source/classes/propacc.cxx
+++ b/basic/source/classes/propacc.cxx
@@ -21,8 +21,9 @@
 #include propacc.hxx
 
 #include basic/sbstar.hxx
-#include sbunoobj.hxx
 #include basic/sbuno.hxx
+#include sbunoobj.hxx
+#include limits.h
 
 #include limits.h
 
___
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/generic vcl/source

2013-11-01 Thread Khaled Hosny
 vcl/generic/glyphs/gcach_layout.cxx |   26 +-
 vcl/source/gdi/sallayout.cxx|   21 +
 2 files changed, 42 insertions(+), 5 deletions(-)

New commits:
commit bb624ea64b13250573016bad7d02395556e80458
Author: Khaled Hosny khaledho...@eglug.org
Date:   Wed Oct 30 09:34:38 2013 +0200

fdo#70968: Incorrect rendering of Devanagari short 'i' vowel

It seems that some Indic fonts assign 'mark' glyph class to combining
spacing marks (spacing not non spacing) so my reliance on the glyph
class to set the IS_DIACRITIC flags broke those fonts. This is a bandaid
to get around the issue, plus some long rant! (at this rate, I'll be
writing The VCL haters handbook pretty soon).

Change-Id: I3ff892acf746d50182573f94e7e8c3c6f9464ae0
Reviewed-on: https://gerrit.libreoffice.org/6485
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/generic/glyphs/gcach_layout.cxx 
b/vcl/generic/glyphs/gcach_layout.cxx
index 848f4cb..c8fbda7 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/generic/glyphs/gcach_layout.cxx
@@ -475,20 +475,36 @@ bool HbLayoutEngine::layout(ServerFontLayout rLayout, 
ImplLayoutArgs rArgs)
 if (bInCluster)
 nGlyphFlags |= GlyphItem::IS_IN_CLUSTER;
 
+// The whole IS_DIACRITIC concept is a stupid hack that was
+// introduced ages ago to work around the utter brokenness of the
+// way justification adjustments are applied (the DXArray fiasco).
+// Since it is such a stupid hack, there is no sane way to directly
+// map to concepts of the outside world, so we do some rather
+// ugly hacks:
+// * If the font has a GDEF table, we check for glyphs with mark
+//   glyph class which is sensible, except that some fonts
+//   (fdo#70968) assign mark class to spacing marks (which is wrong
+//   but usually harmless), so we try to sniff what HarfBuzz thinks
+//   about this glyph by checking if it gives it a zero advance
+//   width.
+// * If the font has no GDEF table, we just check if the glyph has
+//   zero advance width, but this is stupid and can be wrong. A
+//   better way would to check the character's Unicode combining
+//   class, but unfortunately glyph gives combining marks the
+//   cluster value of its base character, so nCharPos will be
+//   pointing to the wrong character (but HarfBuzz might change
+//   this in the future).
 bool bDiacritic = false;
 if (hb_ot_layout_has_glyph_classes(mpHbFace))
 {
 // the font has GDEF table
-if (hb_ot_layout_get_glyph_class(mpHbFace, nGlyphIndex) == 
HB_OT_LAYOUT_GLYPH_CLASS_MARK)
+bool bMark = hb_ot_layout_get_glyph_class(mpHbFace, 
nGlyphIndex) == HB_OT_LAYOUT_GLYPH_CLASS_MARK;
+if (bMark  pHbPositions[i].x_advance == 0)
 bDiacritic = true;
 }
 else
 {
 // the font lacks GDEF table
-// HACK: if the resolved glyph advance is zero assume it is a
-// combining mark.  The whole IS_DIACRITIC concept is a hack to
-// fix the other hacks we use to second-guess glyph advances in
-// ApplyDXArray and the likes and it needs to die
 if (pHbPositions[i].x_advance == 0)
 bDiacritic = true;
 }
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 2340502..6b88e5c 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1012,6 +1012,27 @@ void GenericSalLayout::AdjustLayout( ImplLayoutArgs 
rArgs )
 
 // ---
 
+// This DXArray thing is one of the stupidest ideas I have ever seen (I've been
+// told that it probably a one-to-one mapping of some Windows 3.1 API, which is
+// telling). To justify a text string, Writer calls 
OutputDevice::GetTextArray()
+// to get an array that maps input characters (not glyphs) to their absolute
+// position, GetTextArray() in turn calls SalLayout::FillDXArray() to get an
+// array of character widths that it converts to absolute positions.
+//
+// Writer would then apply justification adjustments to that array of absolute
+// character positions and return to OutputDevice, which eventually calls
+// ApplyDXArray(), which needs to extract the individual adjustments for each
+// character to apply it to corresponding glyphs, and since that information is
+// already lost it tries to do some heuristics to guess it again. Those
+// heuristics often fail, and have always been a source of all sorts of weird
+// text layout bugs, and instead of 

[Libreoffice-commits] core.git: officecfg/registry

2013-11-01 Thread Julien Nabet
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7fb2aa82f69329e73434c7e6a3ce3a1d3d99f2cb
Author: Julien Nabet serval2...@yahoo.fr
Date:   Tue Oct 29 22:30:23 2013 +0100

fdo#68414: SIDEBAR: property's Text named incorrectly

Change-Id: I2b1fdbde3655b26ec7b94fb35e1277be532d3232
Reviewed-on: https://gerrit.libreoffice.org/6480
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 26a2bc8..9f60067 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -186,7 +186,7 @@
 
   node oor:name=TextPropertyPanel oor:op=replace
 prop oor:name=Title oor:type=xs:string
-  value xml:lang=en-USText/value
+  value xml:lang=en-USCharacter/value
 /prop
 prop oor:name=Id oor:type=xs:string
   valueTextPropertyPanel/value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Samuel Mehrbrodt
 sw/source/core/undo/undo.src  |4 ++--
 sw/source/ui/app/app.src  |4 ++--
 sw/source/ui/app/error.src|6 +++---
 sw/source/ui/dochdl/dochdl.src|2 +-
 sw/source/ui/docvw/docvw.src  |   10 +-
 sw/source/ui/fldui/fldui.src  |4 ++--
 sw/source/ui/inc/toolbox.hrc  |2 +-
 sw/source/ui/misc/numberingtypelistbox.src|2 +-
 sw/source/ui/shells/shells.src|   22 +++---
 sw/source/ui/utlui/utlui.src  |   12 ++--
 sw/source/ui/web/web.src  |2 +-
 sw/uiconfig/swriter/ui/bulletsandnumbering.ui |2 +-
 sw/uiconfig/swriter/ui/statisticsinfopage.ui  |2 +-
 sw/uiconfig/swriter/ui/templatedialog16.ui|2 +-
 14 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 90ef8ac1b5d94c24ff0d5a26a8ca6b6769f225c1
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Wed Oct 30 09:43:15 2013 +0100

fdo#70998 Termchange: Graphics-Image

Change-Id: I73458ad8c4f6017bd9fdc36a40b67684d36adbad
Reviewed-on: https://gerrit.libreoffice.org/6483
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index fd66770..8db59db 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -293,11 +293,11 @@ String STR_DRAWDELETE
 };
 String STR_REREAD
 {
-Text [ en-US ] = Replace graphics ;
+Text [ en-US ] = Replace Image ;
 };
 String STR_DELGRF
 {
-Text [ en-US ] = Delete graphics ;
+Text [ en-US ] = Delete Image ;
 };
 String STR_DELOLE
 {
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index a8a503c..e5c6ac6 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -320,7 +320,7 @@ String STR_STATSTR_AUTOFORMAT
 
 String STR_STATSTR_IMPGRF
 {
-Text [ en-US ] = Importing graphics... ;
+Text [ en-US ] = Importing Images... ;
 };
 
 String STR_STATSTR_SEARCH
@@ -403,7 +403,7 @@ String STR_TABLE_DEFNAME
 
 String STR_GRAPHIC_DEFNAME
 {
-Text[ en-US ] = graphics ;
+Text[ en-US ] = Image ;
 };
 
 String STR_OBJECT_DEFNAME
diff --git a/sw/source/ui/app/error.src b/sw/source/ui/app/error.src
index 49836ac..5fe85a1 100644
--- a/sw/source/ui/app/error.src
+++ b/sw/source/ui/app/error.src
@@ -30,7 +30,7 @@ String STR_COMCORE_READERROR
 };
 String STR_COMCORE_CANT_SHOW
 {
-Text [ en-US ] = Graphic cannot be displayed. ;
+Text [ en-US ] = Image cannot be displayed. ;
 };
 
 InfoBox ERR_CLPBRD_READ
@@ -155,11 +155,11 @@ Resource RID_SW_ERRHDL
 };
 String WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_OLE )
 {
-Text [ en-US ] = Some OLE objects could only be loaded as graphics. ;
+Text [ en-US ] = Some OLE objects could only be loaded as Images. ;
 };
 String WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_OLE )
 {
-Text [ en-US ] = Some OLE objects could only be saved as graphics. ;
+Text [ en-US ] = Some OLE objects could only be saved as Images. ;
 };
 String WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_POOR_LOAD )
 {
diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src
index a24976c..4d3ac76 100644
--- a/sw/source/ui/dochdl/dochdl.src
+++ b/sw/source/ui/dochdl/dochdl.src
@@ -48,7 +48,7 @@ String STR_PRIVATETEXT
 };
 String STR_PRIVATEGRAPHIC
 {
-Text [ en-US ] = Graphics [%PRODUCTNAME Writer] ;
+Text [ en-US ] = Image [%PRODUCTNAME Writer] ;
 };
 String STR_PRIVATEOLE
 {
diff --git a/sw/source/ui/docvw/docvw.src b/sw/source/ui/docvw/docvw.src
index 0451ad1..ff10f36 100644
--- a/sw/source/ui/docvw/docvw.src
+++ b/sw/source/ui/docvw/docvw.src
@@ -85,7 +85,7 @@ Menu MN_READONLY_POPUP
 {
 Identifier = MN_READONLY_SAVEGRAPHIC ;
 HelpID = HID_MN_READONLY_SAVEGRAPHIC ;
-Text [ en-US ] = Save Graphics... ;
+Text [ en-US ] = Save Image... ;
 };
 MenuItem
 {
@@ -110,7 +110,7 @@ Menu MN_READONLY_POPUP
 SEPARATOR
 };
 };
-Text [ en-US ] = Add Graphics ;
+Text [ en-US ] = Add Image ;
 };
 MenuItem
 {
@@ -154,20 +154,20 @@ Menu MN_READONLY_POPUP
 {
 Identifier = MN_READONLY_COPYGRAPHIC ;
 HelpID = HID_MN_READONLY_COPYGRAPHIC ;
-Text [ en-US ] = Copy ~Graphics ;
+Text [ en-US ] = Copy ~Image ;
 };
 SEPARATOR
 MenuItem
 {
 Identifier = MN_READONLY_LOADGRAPHIC ;
 HelpID = HID_MN_READONLY_LOADGRAPHIC ;
-Text [ en-US ] = Load Graphics ;
+Text [ en-US ] = Load Image ;
 };
 MenuItem
 {
 Identifier = MN_READONLY_GRAPHICOFF ;
 HelpID = 

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

2013-11-01 Thread Thomas Arnhold
 vcl/inc/sft.hxx   |4 ++--
 vcl/source/fontsubset/sft.cxx |   16 
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 831fc27e2a1478c9edb3d19134d85a5af834049e
Author: Thomas Arnhold tho...@arnhold.org
Date:   Wed Oct 30 11:17:11 2013 +0100

remove nonsense FOLD comments

Conflicts:
vcl/inc/sft.hxx

Change-Id: I1b744f14b6524e4d5913775427280e68c4ee07fc
Reviewed-on: https://gerrit.libreoffice.org/6491
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index 112e739..b5b0548 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.hxx
@@ -280,7 +280,7 @@ namespace vcl
  * @return value of SFErrCodes enum
  * @ingroup sft
  */
-int VCL_DLLPUBLIC OpenTTFontBuffer(const void* pBuffer, sal_uInt32 nLen, 
sal_uInt32 facenum, TrueTypeFont** ttf); /*FOLD01*/
+int VCL_DLLPUBLIC OpenTTFontBuffer(const void* pBuffer, sal_uInt32 nLen, 
sal_uInt32 facenum, TrueTypeFont** ttf);
 #if !defined(WIN32)
 /**
  * TrueTypeFont constructor.
@@ -554,7 +554,7 @@ namespace vcl
  bool GetSfntTable( TrueTypeFont* ttf, int nSubtableIndex,
  const sal_uInt8** ppRawBytes, int* pRawLength );
 
-/*- private definitions */ /*FOLD00*/
+/*- private definitions */
 
 struct _TrueTypeFont {
 sal_uInt32 tag;
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 38199c1..9880b7b 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -58,7 +58,7 @@ static const char *modname  = SunTypeTools-TT;
 static const char *modver   = 1.0;
 static const char *modextra = gelf;
 
-/*- private functions, constants and data types */ /*FOLD00*/
+/*- private functions, constants and data types */
 
 enum PathSegmentType {
 PS_NOOP  = 0,
@@ -214,7 +214,7 @@ const char *ulcodes[LAST_URANGE_BIT+2] = {
 
 
 
-/*- inline functions */ /*FOLD01*/
+/*- inline functions */
 #ifdef __GNUC__
 #define _inline static __inline__
 #else
@@ -454,7 +454,7 @@ static void HexFmtBlockWrite(HexFmt *_this, const void 
*ptr, sal_uInt32 size)
 
 
 
-/* Outline Extraction functions */ /*FOLD01*/
+/* Outline Extraction functions */
 
 /* fills the aw and lsb entries of the TTGlyphMetrics structure from hmtx 
table -*/
 static void GetMetrics(TrueTypeFont *ttf, sal_uInt32 glyphID, TTGlyphMetrics 
*metrics)
@@ -488,7 +488,7 @@ static void GetMetrics(TrueTypeFont *ttf, sal_uInt32 
glyphID, TTGlyphMetrics *me
 static int GetTTGlyphOutline(TrueTypeFont *, sal_uInt32 , ControlPoint **, 
TTGlyphMetrics *, std::vector sal_uInt32 * );
 
 /* returns the number of control points, allocates the pointArray */
-static int GetSimpleTTOutline(TrueTypeFont *ttf, sal_uInt32 glyphID, 
ControlPoint **pointArray, TTGlyphMetrics *metrics) /*FOLD02*/
+static int GetSimpleTTOutline(TrueTypeFont *ttf, sal_uInt32 glyphID, 
ControlPoint **pointArray, TTGlyphMetrics *metrics)
 {
 const sal_uInt8* table = getTable( ttf, O_glyf );
 sal_uInt8 flag, n;
@@ -579,7 +579,7 @@ static int GetSimpleTTOutline(TrueTypeFont *ttf, sal_uInt32 
glyphID, ControlPoin
 return lastPoint + 1;
 }
 
-static int GetCompoundTTOutline(TrueTypeFont *ttf, sal_uInt32 glyphID, 
ControlPoint **pointArray, TTGlyphMetrics *metrics, std::vector sal_uInt32  
glyphlist) /*FOLD02*/
+static int GetCompoundTTOutline(TrueTypeFont *ttf, sal_uInt32 glyphID, 
ControlPoint **pointArray, TTGlyphMetrics *metrics, std::vector sal_uInt32  
glyphlist)
 {
 sal_uInt16 flags, index;
 sal_Int16 e, f, numberOfContours;
@@ -1450,7 +1450,7 @@ static void GetKern(TrueTypeFont *ttf)
 return;
 }
 
-/*- Public functions */ /*FOLD00*/
+/*- Public functions */
 
 int CountTTCFonts(const char* fname)
 {
@@ -1742,7 +1742,7 @@ static int doOpenTTFont( sal_uInt32 facenum, 
TrueTypeFont* t )
 return SF_OK;
 }
 
-void CloseTTFont(TrueTypeFont *ttf) /*FOLD01*/
+void CloseTTFont(TrueTypeFont *ttf)
 {
 #if !defined(WIN32)
 if( ttf-fname )
@@ -1814,7 +1814,7 @@ int GetTTGlyphComponents(TrueTypeFont *ttf, sal_uInt32 
glyphID, std::vector sal
 }
 
 #ifndef NO_TYPE3
-int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname, 
/*FOLD00*/
+int  CreateT3FromTTGlyphs(TrueTypeFont *ttf, FILE *outf, const char *fname,
   sal_uInt16 *glyphArray, sal_uInt8 *encoding, int 
nGlyphs,
   int wmode)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 70998] Termchange: Graphic/Picture - Image

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=70998

--- Comment #5 from Commit Notification 
libreoffice-comm...@lists.freedesktop.org ---
Samuel Mehrbrodt committed a patch related to this issue.
It has been pushed to master:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=90ef8ac1b5d94c24ff0d5a26a8ca6b6769f225c1

fdo#70998 Termchange: Graphics-Image



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: Branch 'libreoffice-4-1' - officecfg/registry

2013-11-01 Thread Julien Nabet
 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b350dc2e1e4c3ac7cb722569d462c95dbb3cbbda
Author: Julien Nabet serval2...@yahoo.fr
Date:   Tue Oct 29 22:30:23 2013 +0100

fdo#68414: SIDEBAR: property's Text named incorrectly

Change-Id: I2b1fdbde3655b26ec7b94fb35e1277be532d3232
Reviewed-on: https://gerrit.libreoffice.org/6480
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-on: https://gerrit.libreoffice.org/6517

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index cd69c01..20d77cc 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -186,7 +186,7 @@
 
   node oor:name=TextPropertyPanel oor:op=replace
 prop oor:name=Title oor:type=xs:string
-  value xml:lang=en-USText/value
+  value xml:lang=en-USCharacter/value
 /prop
 prop oor:name=Id oor:type=xs:string
   valueTextPropertyPanel/value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Samuel Mehrbrodt
 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 84f4b84212c1d3d27376a430d172f3382922f3f9
Author: Samuel Mehrbrodt s.mehrbr...@gmail.com
Date:   Tue Oct 29 20:07:42 2013 +0100

Better approach for fdo#40077: Characters cropped in GTK-Combobox

Now using gtk_widget_size_request() to get the native size.
I reverted the earlier change (border_width etc. ignored)

Change-Id: I0d89a2df5186bd27cbb77c8b0f2cc7b1fb247005
Reviewed-on: https://gerrit.libreoffice.org/6478
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx 
b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 9821dee..67ab5a4 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -219,7 +219,6 @@ static void NWPaintOneEditBox( SalX11Screen nScreen, 
GdkDrawable * gdkDrawable,
ControlState nState, const ImplControlValue 
aValue,
const OUString rCaption );
 
-//---
 static Rectangle NWGetSpinButtonRect( SalX11Screen nScreen, ControlType nType, 
ControlPart nPart, Rectangle aAreaRect, ControlState nState,
 const ImplControlValue aValue, const OUString 
rCaption );
 
@@ -1147,7 +1146,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion(  
ControlType nType,
 rNativeContentRegion = aIndicatorRect;
 returnVal = sal_True;
 }
-if( (nType == CTRL_EDITBOX || nType == CTRL_SPINBOX)  nPart == 
PART_ENTIRE_CONTROL )
+if( (nType == CTRL_EDITBOX || nType == CTRL_SPINBOX || nType == 
CTRL_COMBOBOX)  nPart == PART_ENTIRE_CONTROL )
 {
 NWEnsureGTKEditBox( m_nXScreen );
 GtkWidget* widget = gWidgetData[m_nXScreen].gEditBoxWidget;
@@ -2442,8 +2441,6 @@ static Rectangle NWGetSpinButtonRect( SalX11Screen 
nScreen,
 return( buttonRect );
 }
 
-//---
-
 static void NWPaintOneSpinButton( SalX11Screen nScreen,
   GdkPixmap*pixmap,
   ControlTypenType,
@@ -2609,7 +2606,7 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen 
nScreen,
 gint adjust_x = 
GTK_CONTAINER(gWidgetData[nScreen].gComboWidget)-border_width +
 nFocusWidth +
 nFocusPad;
-gint adjust_y = gWidgetData[nScreen].gComboWidget-style-ythickness;
+gint adjust_y = adjust_x + 
gWidgetData[nScreen].gComboWidget-style-ythickness;
 adjust_x += gWidgetData[nScreen].gComboWidget-style-xthickness;
 aButtonRect.SetSize( Size( aAreaRect.GetWidth() - nButtonWidth - 2 * 
adjust_x,
aAreaRect.GetHeight() - 2 * adjust_y ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Problems compiling LO with Visual Studio 2008

2013-11-01 Thread Jesús Corrius
Hi Thomas,

2013/10/31 Thomas Arnhold thomas-l...@arnhold.org

 Hi Jesús,

 ah sorry. I did it with the Windows 7 SDK and _WINNT_VERSION set to
 Windows XP. The problem is the missing SHARD_APPIDINFO definition.

 http://msdn.microsoft.com/en-**us/library/windows/desktop/**
 dd378453(v=vs.85).aspxhttp://msdn.microsoft.com/en-us/library/windows/desktop/dd378453(v=vs.85).aspx

 Should we just define the hex value of it?


Yeah, just define SHARD_APPIDINFO. This should be easy and clean :)

We'll have to refactor quite a lot of code when we drop support for Windows
XP anyway, and then we can remove all those defines altogether.

Unfortunately to get some of the cool stuff in Windows 8 and 8.1 you need
to use a higher version. Windows 7 is the minimum you should use when
compiling LibreOffice on Windows if you want to distribute your build to
other users. We are quite conservative with this requisite but sometimes
you just have to do it ;)

-- 
Jesús Corrius je...@softcatala.org
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Bug 62525] Convert manual refcounting / copy-on-write implementations to cow_wrapper

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=62525

--- Comment #22 from Marcos Souza marcos.souza@gmail.com ---
It seems that unotools/source/config/pathoptions.cxx in line 175 we have an
manual refcounting, but this is globally inside that file...

I little strange BTW :)

-- 
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 47667] Create chart test documents

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=47667

suokunl...@gmail.com changed:

   What|Removed |Added

 CC||suokunl...@gmail.com

--- Comment #15 from suokunl...@gmail.com ---
The attachment as shown in Bug 71075 should be the simplest chart test
template. (Chart copy between applications).

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

2013-11-01 Thread Stephan Bergmann
 desktop/source/app/cmdlineargs.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 2c2ff538908e4c61987469c9e09325c2b479b185
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 1 11:03:34 2013 +0100

fdo#71005 Remove odd Workaround for automated testing

...that got added by 62ee5e1a752033344c172ad2380a5f1e2492330a INTEGRATION: 
CWS
calcshare2: #i85794# workaround for automated testing but does not make 
much
sense, esp. as all our (subsequent-)checks each use a dedicated, throwaway
UserInstallation anyway.

Change-Id: I64ca47a7d7ee3c2eb2ab33eebcec5a79a7e3d0df

diff --git a/desktop/source/app/cmdlineargs.cxx 
b/desktop/source/app/cmdlineargs.cxx
index a2a1cd1..0a63a3b 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -453,8 +453,6 @@ bool CommandLineArgs::InterpretCommandLineParameter( const 
OUString aArg, OUStr
 else if ( oArg == nolockcheck )
 {
 m_nolockcheck = true;
-// Workaround for automated testing
-::svt::DocumentLockFile::AllowInteraction( false );
 }
 #endif
 else if ( oArg == help || aArg == -h || aArg == -? )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 71043] Use STACK lint tool to clean code ...

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=71043

José Guilherme Vanz v...@libreoffice.org changed:

   What|Removed |Added

   Assignee|libreoffice-b...@lists.free |v...@libreoffice.org
   |desktop.org |

-- 
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 71043] Use STACK lint tool to clean code ...

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=71043

--- Comment #1 from José Guilherme Vanz v...@libreoffice.org ---
I will take a look on this. :-)

-- 
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: chart2/CppunitTest_chart2_import.mk chart2/qa

2013-11-01 Thread Vinaya Mandke
 chart2/CppunitTest_chart2_import.mk   |1 
 chart2/qa/extras/chart2import.cxx |   40 ++
 chart2/qa/extras/charttest.hxx|   20 +
 chart2/qa/extras/data/docx/chart.docx |binary
 4 files changed, 33 insertions(+), 28 deletions(-)

New commits:
commit 486222c7c003e250813bd885a95192bc63cc9830
Author: Vinaya Mandke vinaya.man...@synerzip.com
Date:   Thu Oct 31 11:46:10 2013 +0530

Unit test for Docx Chart Series Name

UT to verify that the series labels are
imported (or rendered) as in the docx file.

Change-Id: I9e4ade7a905dbb894bc163ecec8c333fa6797818
Reviewed-on: https://gerrit.libreoffice.org/6502
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/chart2/CppunitTest_chart2_import.mk 
b/chart2/CppunitTest_chart2_import.mk
index f702ea9..8075625 100644
--- a/chart2/CppunitTest_chart2_import.mk
+++ b/chart2/CppunitTest_chart2_import.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_CppunitTest_use_components,chart2_import,\
 unotools/util/utl \
 unoxml/source/rdf/unordf \
 unoxml/source/service/unoxml \
+writerfilter/util/writerfilter \
 xmloff/util/xo \
 ))
 
diff --git a/chart2/qa/extras/chart2import.cxx 
b/chart2/qa/extras/chart2import.cxx
index f20b834..9ca95b6 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -9,7 +9,6 @@
 
 
 #include charttest.hxx
-#include com/sun/star/drawing/XDrawPageSupplier.hpp
 #include com/sun/star/style/XStyleFamiliesSupplier.hpp
 #include com/sun/star/chart2/CurveStyle.hpp
 #include com/sun/star/chart/ErrorBarStyle.hpp
@@ -17,7 +16,6 @@
 #include com/sun/star/chart/XChartDocument.hpp
 #include com/sun/star/chart/XChartData.hpp
 #include com/sun/star/chart2/XInternalDataProvider.hpp
-#include com/sun/star/chart2/XAnyDescriptionAccess.hpp
 #include com/sun/star/chart/XChartDataArray.hpp
 
 class Chart2ImportTest : public ChartTest
@@ -31,6 +29,7 @@ public:
 void testXLSChartSeries();
 void testODTChartSeries();
 void testDOCChartSeries();
+void testDOCXChartSeries();
 void testPPTXChartSeries();
 void testPPTChartSeries();
 void testODPChartSeries();
@@ -44,6 +43,7 @@ public:
 CPPUNIT_TEST(testXLSChartSeries);
 CPPUNIT_TEST(testODTChartSeries);
 CPPUNIT_TEST(testDOCChartSeries);
+CPPUNIT_TEST(testDOCXChartSeries);
 /*
  *  Disabling Impress Uts.
  *  ChartTest::tearDown() calls dispose of mxComponent
@@ -225,19 +225,7 @@ void Chart2ImportTest::testXLSChartSeries()
 void Chart2ImportTest::testODTChartSeries()
 {
 load(/chart2/qa/extras/data/odt/, chart.odt);
-uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Referencedrawing::XDrawPage xDrawPage = 
xDrawPageSupplier-getDrawPage();
-uno::Referencedrawing::XShape xShape(xDrawPage-getByIndex(0), 
uno::UNO_QUERY);
-CPPUNIT_ASSERT( xShape.is() );
-uno::Referencebeans::XPropertySet xPropertySet(xShape, uno::UNO_QUERY);
-uno::Reference chart2::XChartDocument  xChartDoc;
-xChartDoc.set( xPropertySet-getPropertyValue( Model ), uno::UNO_QUERY );
-CPPUNIT_ASSERT( xChartDoc.is() );
-CPPUNIT_ASSERT( xChartDoc-getDataProvider().is() );
-uno::Referencebeans::XPropertySet xProp(xChartDoc-getDataProvider(), 
uno::UNO_QUERY );
-uno::Reference chart2::XAnyDescriptionAccess  xAnyDescriptionAccess ( 
xChartDoc-getDataProvider(), uno::UNO_QUERY_THROW );
-CPPUNIT_ASSERT( xAnyDescriptionAccess.is() );
-uno::Sequence OUString  seriesList = 
xAnyDescriptionAccess-getColumnDescriptions();
+uno::Sequence OUString  seriesList = 
getWriterChartColumnDescriptions(mxComponent);
 CPPUNIT_ASSERT_EQUAL(OUString(Column 1), seriesList[0]);
 CPPUNIT_ASSERT_EQUAL(OUString(Column 2), seriesList[1]);
 CPPUNIT_ASSERT_EQUAL(OUString(Column 3), seriesList[2]);
@@ -247,24 +235,20 @@ void Chart2ImportTest::testODTChartSeries()
 void Chart2ImportTest::testDOCChartSeries()
 {
 load(/chart2/qa/extras/data/doc/, chart.doc);
-uno::Referencedrawing::XDrawPageSupplier xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Referencedrawing::XDrawPage xDrawPage = 
xDrawPageSupplier-getDrawPage();
-uno::Referencedrawing::XShape xShape(xDrawPage-getByIndex(0), 
uno::UNO_QUERY);
-CPPUNIT_ASSERT( xShape.is() );
-uno::Referencebeans::XPropertySet xPropertySet(xShape, uno::UNO_QUERY);
-uno::Reference chart2::XChartDocument  xChartDoc;
-xChartDoc.set( xPropertySet-getPropertyValue( Model ), uno::UNO_QUERY );
-CPPUNIT_ASSERT( xChartDoc.is() );
-CPPUNIT_ASSERT( xChartDoc-getDataProvider().is() );
-uno::Referencebeans::XPropertySet xProp(xChartDoc-getDataProvider(), 
uno::UNO_QUERY );
-uno::Reference chart2::XAnyDescriptionAccess  xAnyDescriptionAccess ( 
xChartDoc-getDataProvider(), uno::UNO_QUERY_THROW );
-CPPUNIT_ASSERT( xAnyDescriptionAccess.is() );
-

[Bug 70998] Termchange: Graphic/Picture - Image

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=70998

Stanislav Horacek stanislav.hora...@gmail.com changed:

   What|Removed |Added

 CC||stanislav.hora...@gmail.com

--- Comment #6 from Stanislav Horacek stanislav.hora...@gmail.com ---
I can't judge if this change is useful (and it would be nice if a native
speaker could comment it), but I'm wondering why you use Image always
capitalized, even in sentences like Unknown Image format. Is there any reason
for that?

Btw, if you have finished this, I can change the terms in help.

-- 
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: Branch 'feature/tiledrendering' - 2 commits - ios/shared sw/source

2013-11-01 Thread Ptyl Dragon
 ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m 
 |  117 --
 
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.h
 |1 
 
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
 |6 
 sw/source/core/view/viewsh.cxx 
 |   11 
 4 files changed, 111 insertions(+), 24 deletions(-)

New commits:
commit 3bd4b54bcd18f6614fd1274b10fdd99c24a5cece
Author: Ptyl Dragon p...@cloudon.com
Date:   Fri Nov 1 12:51:51 2013 +0200

removed DPX RIP (0,0) coords shift. played with rendering parameters

Change-Id: Ib2a3b017aa59bc1a8408b42f101fd041270494aa

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 6d1837c..8280222 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1810,10 +1810,11 @@ void touch_lo_draw_tile(void *context, int 
contextWidth, int contextHeight, MLOD
 aMapMode.SetScaleX(scaleX);
 aMapMode.SetScaleY(scaleY);
 aDevice.SetMapMode(aMapMode);
+SetSwVisArea( pViewShell, SwRect(Point(tilePosX, tilePosY), 
Size(tileWidth, tileHeight)) );
 // resizes the virtual device so to contain the entrie context
 aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight));
 // draw - works in logic coordinates
-pViewShell-PaintTile(aDevice, Rectangle(Point(tilePosX, tilePosY), 
Size(tileWidth, tileHeight)));
+pViewShell-PaintTile(aDevice, Rectangle(Point(0, 0), Size(tileWidth, 
tileHeight)));
 // copy the aDevice content to mpImage
 Bitmap aBitmap(aDevice.GetBitmap(aDevice.PixelToLogic(Point(0,0)), 
aDevice.PixelToLogic(Size(contextWidth, contextHeight;
 BitmapReadAccess * readAccess = aBitmap.AcquireReadAccess();
@@ -1845,8 +1846,8 @@ MLODpxSize touch_lo_get_content_size()
 extern C
 MLORipPoint MLORipPointByDpxPoint(MLODpxPoint mloDpxPoint)
 {
-MLODpxSize contentSize = touch_lo_get_content_size();
-MLORip x = MLORipByDpx(mloDpxPoint.x - (contentSize.width/2.0f));
+//MLODpxSize contentSize = touch_lo_get_content_size();
+MLORip x = MLORipByDpx(mloDpxPoint.x /*- (contentSize.width/2.0f)*/);
 MLORip y = MLORipByDpx(mloDpxPoint.y);
 return MLORipPointByRips(x,y);
 }
@@ -1854,8 +1855,8 @@ MLORipPoint MLORipPointByDpxPoint(MLODpxPoint mloDpxPoint)
 extern C
 MLODpxPoint MLODpxPointByRipPoint(MLORipPoint mloRipPoint)
 {
-MLODpxSize contentSize = touch_lo_get_content_size();
-MLODpx x = MLODpxByRip(mloRipPoint.x) + (contentSize.width/2.0f);
+//MLODpxSize contentSize = touch_lo_get_content_size();
+MLODpx x = MLODpxByRip(mloRipPoint.x)/* + (contentSize.width/2.0f)*/;
 MLODpx y = MLODpxByRip(mloRipPoint.y);
 return MLODpxPointByDpxes(x,y);
 }
commit b75dd58ba7359d78a6cb241d92ff70ee1f01de20
Author: Ptyl Dragon p...@cloudon.com
Date:   Fri Nov 1 12:48:31 2013 +0200

tiledrendering new stepper ui for tor

Change-Id: I3d4586c84adfa9f0416a043230c6227bda98d9dd

diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
index f286390..22d98fa 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
@@ -14,9 +14,14 @@
 @property (nonatomic,strong) MLOTestingTileParameterExtractor extractor;
 @property UILabel * label;
 @property UITextField * data;
+@property UITextField * step;
 @property NSInteger defaultValue;
+@property UIStepper * dataStepper;
+@property UIStepper * stepStepper;
 @end
 
+static const CGFloat DEFAULT_STEP_VALUE = 1;
+
 @implementation MLOTestingTileParameter
 
 -(MLOTestingTileParameter 
*)initWithParams:(MLOTestingTileParametersViewController *) params 
label:(NSString *)label extractor:(MLOTestingTileParameterExtractor) extractor 
defaultValue:(NSInteger) defaultValue{
@@ -26,13 +31,59 @@
 self.params = params;
 self.extractor = extractor;
 self.defaultValue = defaultValue;
-
 [self initLabel:label];
-[self initTextField];
+self.dataStepper = [self createStepper];
+self.stepStepper = [self createStepper];
+[self initDataTextField];
+[self initStepTextField];
 }
 return self;
 }
 
+-(UIStepper *) createStepper{
+UIStepper * stepper = [UIStepper new];
+stepper.maximumValue = MAXFLOAT;
+stepper.minimumValue = -MAXFLOAT;
+stepper.stepValue = DEFAULT_STEP_VALUE;
+stepper.autorepeat = YES;
+stepper.continuous = NO;
+[stepper addObserver:self forKeyPath:@value
+  options: NSKeyValueObservingOptionNew
+  context:0];
+return stepper;
+}
+
+- 

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - ce/3bf80e215a36d919e5479535a9505dc7cd6656

2013-11-01 Thread Caolán McNamara
 ce/3bf80e215a36d919e5479535a9505dc7cd6656 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7570e05203ca57e107d03871b928fe642636a504
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 10:54:10 2013 +

Notes added by 'git notes add'

diff --git a/ce/3bf80e215a36d919e5479535a9505dc7cd6656 
b/ce/3bf80e215a36d919e5479535a9505dc7cd6656
new file mode 100644
index 000..96afdaf
--- /dev/null
+++ b/ce/3bf80e215a36d919e5479535a9505dc7cd6656
@@ -0,0 +1 @@
+prefer: 83ba821c10392c08334f7d8d3775fe3e8d08f8fd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Stephan Bergmann
 svx/source/svdraw/svdograf.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 08698f258f0627f582b1b56b019da5cd4d3e5a7c
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 1 11:55:07 2013 +0100

Pass OUString by const 

Change-Id: I6b3d6709eb8e3471aaa6ad7b3bcba3319719218b

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 6adf75b..296834ca 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -102,7 +102,7 @@ sal_uInt32 getCacheTimeInMs()
 return 0;
 }
 
-const Graphic ImpLoadLinkedGraphic( const OUString aFileName, const OUString 
aFilterName )
+const Graphic ImpLoadLinkedGraphic( const OUString aFileName, const OUString 
aFilterName )
 {
 Graphic aGraphic;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 72/f0029a85e4807724898c90e7fdb96895948587

2013-11-01 Thread Caolán McNamara
 72/f0029a85e4807724898c90e7fdb96895948587 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c887a8fa862d57c69eb8f5e00759a8effa0bcc2d
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 11:04:03 2013 +

Notes added by 'git notes add'

diff --git a/72/f0029a85e4807724898c90e7fdb96895948587 
b/72/f0029a85e4807724898c90e7fdb96895948587
new file mode 100644
index 000..44937c0
--- /dev/null
+++ b/72/f0029a85e4807724898c90e7fdb96895948587
@@ -0,0 +1 @@
+prefer: ed740489ed39e0fc3ec43e3f3a1e6e9e366a2c5e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared

2013-11-01 Thread Ptyl Dragon
 ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m 
|8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 2902b39b3e349f26c04fc93acd37b7db813b1e55
Author: Ptyl Dragon p...@cloudon.com
Date:   Fri Nov 1 13:09:28 2013 +0200

UISteppers now go down as well

Change-Id: I06e1b7fec490ec373a9775915d6dc2c30ce805f1

diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
index 22d98fa..1107eef 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
@@ -48,7 +48,7 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
 stepper.autorepeat = YES;
 stepper.continuous = NO;
 [stepper addObserver:self forKeyPath:@value
-  options: NSKeyValueObservingOptionNew
+  options: NSKeyValueObservingOptionNew | 
NSKeyValueObservingOptionOld
   context:0];
 return stepper;
 }
@@ -57,8 +57,10 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
 {
 
 if (object == self.dataStepper) {
- NSNumber * floatNumber = change[NSKeyValueChangeNewKey];
-CGFloat value = [self currentDataValue] + [floatNumber floatValue];
+NSNumber * newNumber = change[NSKeyValueChangeNewKey];
+NSNumber * oldNumber = change[NSKeyValueChangeOldKey];
+
+CGFloat value = [self currentDataValue] + [newNumber floatValue] - 
[oldNumber floatValue];
 
 if(value == ((NSInteger) value)){
 self.data.text = [[NSNumber numberWithInteger:(NSInteger) value] 
stringValue];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 70998] Termchange: Graphic/Picture - Image

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=70998

--- Comment #7 from Samuel M. s.mehrbr...@gmail.com ---
(In reply to comment #6)
 I can't judge if this change is useful (and it would be nice if a native
 speaker could comment it), but I'm wondering why you use Image always
 capitalized, even in sentences like Unknown Image format. Is there any
 reason for that?

It's Sentence Case (see
https://wiki.documentfoundation.org/Development/WidgetLayout#Widgets_requiring_HIG_guidelines_review)

 Btw, if you have finished this, I can change the terms in help.

Thank's, I'll let you know.

-- 
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: Problems compiling LO with Visual Studio 2008

2013-11-01 Thread Pavel Laštovička

Hi Michael,

Dne 31.10.2013 22:58, Michael Stahl napsal(a):
perhaps you will run into other issues too; since 2008 support was removed 
completely on master due to the high maintenace effort (uses different project 
files than newer versions etc.), there is probably little interest in getting the 
4-1 branch to build; better to just use a newer MSVC. 


is it safe to use Express edition of Visual Studio or is Professional edition 
needed?

Regards,

Pavel Laštovička
blue.point Solutions spol. s  r. o.


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


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

2013-11-01 Thread Caolán McNamara
 connectivity/source/drivers/mozab/MResultSet.cxx |2 
 sw/source/filter/ww8/escher.hxx  |7 
 sw/source/filter/ww8/wrtw8esh.cxx|  225 +
 sw/source/filter/ww8/wrtww8.cxx  |   10 
 sw/source/filter/ww8/wrtww8.hxx  |2 
 sw/source/filter/ww8/ww8graf.cxx |   42 +++
 sw/source/filter/ww8/ww8par.cxx  |  304 ++-
 sw/source/filter/ww8/ww8par.hxx  |   48 +++
 8 files changed, 633 insertions(+), 7 deletions(-)

New commits:
commit 0b79f6ce62cf0d11e971b15e43b56e06a913389e
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 11:18:44 2013 +

cannot convert parameter 1 from ´const char [2]´ to ´sal_Unicode

Change-Id: I66a1005c3f6bcad448ed2c162a8399c7c32ad78e

diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx 
b/connectivity/source/drivers/mozab/MResultSet.cxx
index 845ba0e..fbf0b853 100644
--- a/connectivity/source/drivers/mozab/MResultSet.cxx
+++ b/connectivity/source/drivers/mozab/MResultSet.cxx
@@ -908,7 +908,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode*   
  parseT
 parseParameter( pAtom, matchString );
 // Replace all '*' with '%' : UI Usually does this but not with
 // Parameters for some reason.
-matchString = matchString.replace( ALT_WILDCARD, WILDCARD );
+matchString = matchString.replaceAll( ALT_WILDCARD, WILDCARD );
 }
 else
 {
commit d0b30f90d4be58ba78fded099f25a75d3cf88d56
Author: Jian Hong Cheng chen...@apache.org
Date:   Mon Dec 3 14:09:34 2012 +

Made some changes to remove the compile warnings...

on the comparison between un-uniform data types

(cherry picked from commit e0705e2a87726c6d8a04eae624d4f032c5d596ce)

Conflicts:
sw/source/filter/ww8/wrtw8esh.cxx
sw/source/filter/ww8/wrtww8.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par.hxx
sw/source/filter/ww8/ww8par3.cxx

Change-Id: I1e6931e01fdcce6c1a4e98a86fcbc08f5e0933bd

diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 24ab7c4..627ed85 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -305,7 +305,7 @@ void WW8_WrtBookmarks::MoveFieldMarks(WW8_CP nFrom, WW8_CP 
nTo)
 {
 if (aItr-second)
 {
-if (aItr-second-first == nFrom)
+if (aItr-second-first == (long)nFrom)
 {
 aItr-second-second.first = true;
 aItr-second-first = nTo;
@@ -1407,8 +1407,8 @@ int MSWordExportBase::CollectGrfsOfBullets()
 
 if ( pDoc )
 {
-int nCountRule = pDoc-GetNumRuleTbl().size();
-for (int n = 0; n  nCountRule; ++n)
+size_t nCountRule = pDoc-GetNumRuleTbl().size();
+for (size_t n = 0; n  nCountRule; ++n)
 {
 const SwNumRule rRule = *( pDoc-GetNumRuleTbl().at(n) );
 sal_uInt16 nLevels = rRule.IsContinusNum() ? 1 : 9;
@@ -1423,7 +1423,7 @@ int MSWordExportBase::CollectGrfsOfBullets()
 if ( pGraf )
 {
 bool bHas = false;
-for (unsigned i = 0; i  m_vecBulletPic.size(); ++i)
+for (size_t i = 0; i  m_vecBulletPic.size(); ++i)
 {
 if (m_vecBulletPic[i]-GetChecksum() == 
pGraf-GetChecksum())
 {
@@ -1522,7 +1522,7 @@ int MSWordExportBase::GetGrfIndex(const SvxBrushItem 
rBrush)
 int nIndex = -1;
 if ( rBrush.GetGraphic() )
 {
-for (unsigned i = 0; i  m_vecBulletPic.size(); ++i)
+for (size_t i = 0; i  m_vecBulletPic.size(); ++i)
 {
 if (m_vecBulletPic[i]-GetChecksum() == 
rBrush.GetGraphic()-GetChecksum())
 {
diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index c74f8bd..6ff803e 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2589,12 +2589,17 @@ SwFrmFmt* SwWW8ImplReader::Read_GrafLayer( long 
nGrafAnchorCp )
  pData-GetId() == SW_UD_IMAPDATA)
 {
 SwMacroInfo* macInf = dynamic_castSwMacroInfo*(pData);
-if( macInf  macInf-GetShapeId() == pF-nSpId)
+
+if( macInf )//  macInf-GetShapeId() == pF-nSpId)
 {
-lnName = macInf-GetHlink();
-aObjName = macInf-GetName();
-aTarFrm = macInf-GetTarFrm();
-break;
+sal_Int32 nShapeId = macInf-GetShapeId();
+if ( nShapeId ==  pF-nSpId )
+{
+lnName = macInf-GetHlink();
+aObjName = macInf-GetName();
+  

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e0/705e2a87726c6d8a04eae624d4f032c5d596ce

2013-11-01 Thread Caolán McNamara
 e0/705e2a87726c6d8a04eae624d4f032c5d596ce |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 59dbd57b75fc058297b19cfbdd5c34dc69db8f89
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 11:24:11 2013 +

Notes added by 'git notes add'

diff --git a/e0/705e2a87726c6d8a04eae624d4f032c5d596ce 
b/e0/705e2a87726c6d8a04eae624d4f032c5d596ce
new file mode 100644
index 000..40d9755
--- /dev/null
+++ b/e0/705e2a87726c6d8a04eae624d4f032c5d596ce
@@ -0,0 +1 @@
+merged as: d0b30f90d4be58ba78fded099f25a75d3cf88d56
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 38/69d0164607a1576826dcc338b1f8b52f1147bd 8f/7c7a5713e92aecfe4837e628a001b7668c9540

2013-11-01 Thread Caolán McNamara
 38/69d0164607a1576826dcc338b1f8b52f1147bd |1 +
 8f/7c7a5713e92aecfe4837e628a001b7668c9540 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit f6e96cf0dbefc49be224fc781da440d796346a4b
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 11:24:37 2013 +

Notes added by 'git notes add'

diff --git a/8f/7c7a5713e92aecfe4837e628a001b7668c9540 
b/8f/7c7a5713e92aecfe4837e628a001b7668c9540
new file mode 100644
index 000..7d4cae2
--- /dev/null
+++ b/8f/7c7a5713e92aecfe4837e628a001b7668c9540
@@ -0,0 +1 @@
+merged as: c1c49d8fdf78ed820ab3b9e4b82ea383ecce39e1
commit 8a01de4c186e5449d968cb0671ce449b8382c1c8
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 11:24:24 2013 +

Notes added by 'git notes add'

diff --git a/38/69d0164607a1576826dcc338b1f8b52f1147bd 
b/38/69d0164607a1576826dcc338b1f8b52f1147bd
new file mode 100644
index 000..6e0e88a
--- /dev/null
+++ b/38/69d0164607a1576826dcc338b1f8b52f1147bd
@@ -0,0 +1 @@
+merged as: 40543e5321c8f618c125fd6f7f9a24b87431277a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 4a/3a3afa32785d0b1051d9d1104adbbb0e61a820

2013-11-01 Thread Caolán McNamara
 4a/3a3afa32785d0b1051d9d1104adbbb0e61a820 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e41c8e1aac4e0f03f20cd522976487da3a3a10ac
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 11:24:45 2013 +

Notes added by 'git notes add'

diff --git a/4a/3a3afa32785d0b1051d9d1104adbbb0e61a820 
b/4a/3a3afa32785d0b1051d9d1104adbbb0e61a820
new file mode 100644
index 000..7d4cae2
--- /dev/null
+++ b/4a/3a3afa32785d0b1051d9d1104adbbb0e61a820
@@ -0,0 +1 @@
+merged as: c1c49d8fdf78ed820ab3b9e4b82ea383ecce39e1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 94/1a8234d09277dc6d00afe15cb300b8c049f927

2013-11-01 Thread Caolán McNamara
 94/1a8234d09277dc6d00afe15cb300b8c049f927 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4299b0b2459406cc60fbce00f7a568c2630c4418
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 11:25:18 2013 +

Notes added by 'git notes add'

diff --git a/94/1a8234d09277dc6d00afe15cb300b8c049f927 
b/94/1a8234d09277dc6d00afe15cb300b8c049f927
new file mode 100644
index 000..b1318d8
--- /dev/null
+++ b/94/1a8234d09277dc6d00afe15cb300b8c049f927
@@ -0,0 +1 @@
+prefer: c1c49d8fdf78ed820ab3b9e4b82ea383ecce39e1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Stephan Bergmann
 sw/source/filter/ww8/wrtw8esh.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 79e469184bff942e1640e382e76596af22cbeb4f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 1 12:50:17 2013 +0100

-Werror,-Wunused-variable

Change-Id: Icedd42e4cbdf76bba9fd21e8ead2c8e5dcaf52f1

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx 
b/sw/source/filter/ww8/wrtw8esh.cxx
index 695523f..1b3ab30 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -298,7 +298,6 @@ void SwBasicEscherEx::PreWriteHyperlinkWithinFly(const 
SwFrmFmt rFmt,EscherProp
 if (pINetFmt  !pINetFmt-GetURL().isEmpty())
 {
 SvMemoryStream *rStrm = new SvMemoryStream ;
-OUString tmpstr = pINetFmt-GetURL();
 WriteHyperlinkWithinFly( *rStrm, pINetFmt );
 sal_uInt8* pBuf = (sal_uInt8*) rStrm-GetData();
 sal_uInt32 nSize = rStrm-Seek( STREAM_SEEK_TO_END );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Stephan Bergmann
 sw/source/filter/ww8/ww8par.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c8f18aa3feaa97ef671343c2bab4de3230c5b676
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 1 12:52:20 2013 +0100

-Werror,-Wunused-variable

Change-Id: I3bf848c49c5ff980a3a8cc8b84333cb4d0d480df

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index cc4336f..9559bf0 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -1116,7 +1116,6 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream rSt,
  if( (0  nBufferSize)  (nBufferSize = 0x)  SeekToContent( 
DFF_Prop_pihlShape, rSt ) )
 {
 SvMemoryStream aMemStream;
-OUString aStrURL;
 struct HyperLinksTable hlStr;
 sal_uInt16 mnRawRecId,mnRawRecSize;
 aMemStream  sal_uInt16( 0 )  static_cast sal_uInt16 ( 
nBufferSize );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Stephan Bergmann
 svx/source/svdraw/svdograf.cxx |   34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

New commits:
commit c399eea88b3f55ab5334552cba89c6e817490a0d
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 1 12:59:41 2013 +0100

SdrGraphLink::pGrafObj can never be null

Change-Id: Ifeb77e61040accd1f7f7ed31d0340c66fbab39a5

diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 296834ca..5dff972 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -136,11 +136,11 @@ const Graphic ImpLoadLinkedGraphic( const OUString 
aFileName, const OUString a
 class SdrGraphicUpdater;
 class SdrGraphicLink : public sfx2::SvBaseLink
 {
-SdrGrafObj* pGrafObj;
+SdrGrafObj rGrafObj;
 SdrGraphicUpdater*  pGraphicUpdater;
 
 public:
-SdrGraphicLink(SdrGrafObj* pObj);
+SdrGraphicLink(SdrGrafObj rObj);
 virtual ~SdrGraphicLink();
 
 virtual voidClosed();
@@ -219,9 +219,9 @@ void SAL_CALL SdrGraphicUpdater::run(void)
 }
 }
 
-SdrGraphicLink::SdrGraphicLink(SdrGrafObj* pObj)
+SdrGraphicLink::SdrGraphicLink(SdrGrafObj rObj)
 : ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SOT_FORMATSTR_ID_SVXB )
-, pGrafObj( pObj )
+, rGrafObj( rObj )
 , pGraphicUpdater( NULL )
 {
 SetSynchron( false );
@@ -235,7 +235,7 @@ SdrGraphicLink::~SdrGraphicLink()
 
 void SdrGraphicLink::DataChanged( const Graphic rGraphic )
 {
-pGrafObj-ImpSetLinkedGraphic( rGraphic );
+rGrafObj.ImpSetLinkedGraphic( rGraphic );
 }
 
 void SdrGraphicLink::RemoveGraphicUpdater()
@@ -246,23 +246,23 @@ void SdrGraphicLink::RemoveGraphicUpdater()
 ::sfx2::SvBaseLink::UpdateResult SdrGraphicLink::DataChanged(
 const OUString rMimeType, const ::com::sun::star::uno::Any  rValue )
 {
-SdrModel*   pModel  = pGrafObj ? pGrafObj-GetModel() : 0;
+SdrModel*   pModel  = rGrafObj.GetModel();
 sfx2::LinkManager* pLinkManager= pModel  ? pModel-GetLinkManager() : 0;
 
 if( pLinkManager  rValue.hasValue() )
 {
-pLinkManager-GetDisplayNames( this, 0, pGrafObj-aFileName, 0, 
pGrafObj-aFilterName );
+pLinkManager-GetDisplayNames( this, 0, rGrafObj.aFileName, 0, 
rGrafObj.aFilterName );
 
 Graphic aGraphic;
 if( sfx2::LinkManager::GetGraphicFromAny( rMimeType, rValue, aGraphic 
))
 {
-   pGrafObj-NbcSetGraphic( aGraphic );
-pGrafObj-ActionChanged();
+   rGrafObj.NbcSetGraphic( aGraphic );
+rGrafObj.ActionChanged();
 }
 else if( SotExchange::GetFormatIdFromMimeType( rMimeType ) != 
sfx2::LinkManager::RegisterStatusInfoId() )
 {
 // broadcasting, to update slide sorter
-pGrafObj-BroadcastObjectChange();
+rGrafObj.BroadcastObjectChange();
 }
 }
 return SUCCESS;
@@ -271,9 +271,9 @@ void SdrGraphicLink::RemoveGraphicUpdater()
 void SdrGraphicLink::Closed()
 {
 // close connection; set pLink of the object to NULL, as link instance is 
just about getting destructed.
-pGrafObj-ForceSwapIn();
-pGrafObj-pGraphicLink=NULL;
-pGrafObj-ReleaseGraphicLink();
+rGrafObj.ForceSwapIn();
+rGrafObj.pGraphicLink=NULL;
+rGrafObj.ReleaseGraphicLink();
 SvBaseLink::Closed();
 }
 
@@ -283,14 +283,14 @@ void SdrGraphicLink::UpdateAsynchron()
 {
 if ( pGraphicUpdater )
 {
-if ( pGraphicUpdater-GraphicLinkChanged( pGrafObj-GetFileName() 
) )
+if ( pGraphicUpdater-GraphicLinkChanged( rGrafObj.GetFileName() ) 
)
 {
 pGraphicUpdater-Terminate();
-pGraphicUpdater = new SdrGraphicUpdater( 
pGrafObj-GetFileName(), pGrafObj-GetFilterName(), *this );
+pGraphicUpdater = new SdrGraphicUpdater( 
rGrafObj.GetFileName(), rGrafObj.GetFilterName(), *this );
 }
 }
 else
-pGraphicUpdater = new SdrGraphicUpdater( pGrafObj-GetFileName(), 
pGrafObj-GetFilterName(), *this );
+pGraphicUpdater = new SdrGraphicUpdater( rGrafObj.GetFileName(), 
rGrafObj.GetFilterName(), *this );
 }
 }
 
@@ -635,7 +635,7 @@ void SdrGrafObj::ImpLinkAnmeldung()
 {
 if (!aFileName.isEmpty())
 {
-pGraphicLink = new SdrGraphicLink( this );
+pGraphicLink = new SdrGraphicLink( *this );
 pLinkManager-InsertFileLink(
 *pGraphicLink, OBJECT_CLIENT_GRF, aFileName, 
(aFilterName.isEmpty() ? NULL : aFilterName), NULL);
 pGraphicLink-Connect();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - sw/source

2013-11-01 Thread Tor Lillqvist
 sw/source/core/view/viewsh.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e43d5d17b5e31a6ab5de12c95fd4238ca959c2a9
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 1 14:23:45 2013 +0200

Pass tilePosX/Y also to PaintTile()

Change-Id: I85360889bf723fa8b603dfbe7a6f99d99c70c72f

diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 8280222..67d7974 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -1814,7 +1814,7 @@ void touch_lo_draw_tile(void *context, int contextWidth, 
int contextHeight, MLOD
 // resizes the virtual device so to contain the entrie context
 aDevice.SetOutputSizePixel(Size(contextWidth, contextHeight));
 // draw - works in logic coordinates
-pViewShell-PaintTile(aDevice, Rectangle(Point(0, 0), Size(tileWidth, 
tileHeight)));
+pViewShell-PaintTile(aDevice, Rectangle(Point(tilePosX, tilePosY), 
Size(tileWidth, tileHeight)));
 // copy the aDevice content to mpImage
 Bitmap aBitmap(aDevice.GetBitmap(aDevice.PixelToLogic(Point(0,0)), 
aDevice.PixelToLogic(Size(contextWidth, contextHeight;
 BitmapReadAccess * readAccess = aBitmap.AcquireReadAccess();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared

2013-11-01 Thread Tor Lillqvist
 
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
 |4 
 1 file changed, 4 deletions(-)

New commits:
commit acc592a28a3648aa56c0db41f3c3fc50be8f0191
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 1 14:38:46 2013 +0200

No Y flip needed here

Change-Id: I2518a6151050edee8796a77633097fdd11202647

diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
index f066116..864244e 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
@@ -46,10 +46,6 @@
 CGContextRef context = UIGraphicsGetCurrentContext();
 
 CGContextSaveGState(context);
-CGContextTranslateCTM(context, 0, self.tester.params.contextHeight);
-CGContextScaleCTM(context, 1, -1);
-CGContextScaleCTM(context, 1, 1);
-
 touch_lo_draw_tile(context,
self.tester.params.contextWidth,
self.tester.params.contextHeight,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: extras/source starmath/inc starmath/source starmath/uiconfig starmath/UIConfig_smath.mk

2013-11-01 Thread Caolán McNamara
 extras/source/glade/libreoffice-catalog.xml.in |3 
 starmath/UIConfig_smath.mk |1 
 starmath/inc/dialog.hxx|   27 +-
 starmath/inc/starmath.hrc  |1 
 starmath/source/dialog.cxx |  119 +---
 starmath/source/smres.src  |   77 
 starmath/uiconfig/smath/ui/fontdialog.ui   |  229 +
 7 files changed, 296 insertions(+), 161 deletions(-)

New commits:
commit dfbbda5623c0ec92febcd6e2e714fc682e496512
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 12:45:29 2013 +

convert math font dialog to .ui

Change-Id: Ib7bf087664b6c8491872dfa37c750485fedabbe2

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index 0124f49..6344078 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -230,6 +230,9 @@
 glade-widget-class title=Show Math Symbol name=smlo-SmShowSymbol
 generic-name=Show Math Symbol parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
+glade-widget-class title=Show Math Font name=smlo-SmShowFont
+generic-name=Show Math Font parent=GtkDrawingArea
+icon-name=widget-gtk-drawingarea/
 glade-widget-class title=Math Symbol Selection 
name=smlo-SmShowSymbolSet
 generic-name=Math Symbol Selection 
parent=GtkDrawingArea
 icon-name=widget-gtk-drawingarea/
diff --git a/starmath/UIConfig_smath.mk b/starmath/UIConfig_smath.mk
index 3683c15..2dc455a 100644
--- a/starmath/UIConfig_smath.mk
+++ b/starmath/UIConfig_smath.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/smath,\
 $(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
starmath/uiconfig/smath/ui/alignmentdialog \
starmath/uiconfig/smath/ui/catalogdialog \
+   starmath/uiconfig/smath/ui/fontdialog \
starmath/uiconfig/smath/ui/fontsizedialog \
starmath/uiconfig/smath/ui/fonttypedialog \
starmath/uiconfig/smath/ui/printeroptions \
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 423ffed..8b3aae2 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -74,44 +74,39 @@ public:
 
 /**/
 
-class SmShowFont : public Control
+class SmShowFont : public Window
 {
-virtual voidPaint(const Rectangle);
+virtual void Paint(const Rectangle);
 
 public:
-SmShowFont(Window *pParent, const ResId rResId) :
-Control(pParent, rResId)
+SmShowFont(Window *pParent, WinBits nStyle)
+: Window(pParent, nStyle)
 {
 }
-
+virtual Size GetOptimalSize() const;
 void SetFont(const Font rFont);
 };
 
 class SmFontDialog : public ModalDialog
 {
-FixedText   aFixedText1;
-ComboBoxaFontBox;
-CheckBoxaBoldCheckBox;
-CheckBoxaItalicCheckBox;
-OKButtonaOKButton1;
-HelpButton  aHelpButton1;
-CancelButtonaCancelButton1;
-SmShowFont  aShowFont;
-FixedText   aFixedText2;
+ComboBox*   m_pFontBox;
+VclContainer*   m_pAttrFrame;
+CheckBox*   m_pBoldCheckBox;
+CheckBox*   m_pItalicCheckBox;
+SmShowFont* m_pShowFont;
 
 FontFace;
 
 DECL_LINK(FontSelectHdl, ComboBox *);
 DECL_LINK(FontModifyHdl, ComboBox *);
 DECL_LINK(AttrChangeHdl, CheckBox *);
-DECL_LINK(HelpButtonClickHdl, Button *);
 
 voidInitColor_Impl();
 
 virtual voidDataChanged( const DataChangedEvent rDCEvt );
 
 public:
-SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool 
bHideCheckboxes, bool bFreeRes = true);
+SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, bool 
bHideCheckboxes);
 
 const Font GetFont() const { return Face; }
 voidSetFont(const Font rFont);
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 206e358..e053829 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -76,7 +76,6 @@
 #define SID_ELEMENTSDOCKINGWINDOW   (SID_SMA_START + 126)
 
 
-#define RID_FONTDIALOG  (RID_APP_START + 2)
 #define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
 #define RID_PRINTUIOPTIONS  (RID_APP_START + 11)
 
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 6c3d474..73d93ab 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -231,7 +231,7 @@ SfxTabPage* SmPrintOptionsTabPage::Create(Window* pWindow, 
const SfxItemSet rSe
 
 void SmShowFont::Paint(const Rectangle rRect )
 {
-Control::Paint( rRect );
+Window::Paint( rRect );
 
 OUString   Text (GetFont().GetName());
 SizeTextSize(GetTextWidth(Text), GetTextHeight());
@@ 

[Libreoffice-commits] core.git: helpcontent2

2013-11-01 Thread Caolán McNamara
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1e5367fc87719e700ed34367bc30a21920bbe73b
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 12:48:10 2013 +

Updated core
Project: help  ae178e85f974c49304b0f2a950979d1adaa466ae

diff --git a/helpcontent2 b/helpcontent2
index da63fbf..ae178e8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit da63fbfdefb02c5026b05b33a57afe03a30f42b8
+Subproject commit ae178e85f974c49304b0f2a950979d1adaa466ae
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Caolán McNamara
 helpers/help_hid.lst  |5 -
 source/text/smath/01/05010100.xhp |   16 
 2 files changed, 8 insertions(+), 13 deletions(-)

New commits:
commit ae178e85f974c49304b0f2a950979d1adaa466ae
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 12:48:10 2013 +

update help ids for math font dialog .ui conversion

Change-Id: I9598ad953555082e4e650f0d3299ca50c08f168d

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 951e908..c3b2443 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3390,7 +3390,6 @@ HID_SMA_EX,63134,
 HID_SMA_EXISTS,63160,
 HID_SMA_EXPX,63135,
 HID_SMA_FACTX,63131,
-HID_SMA_FONTDIALOG,63026,
 HID_SMA_FONTXY,63223,
 HID_SMA_FORALL,63161,
 HID_SMA_FORMAT_CAT,63186,
@@ -6500,9 +6499,6 @@ sfx2_PushButton_TP_HELP_BOOKMARKS_PB_BOOKMARKS,547017228,
 sfx2_PushButton_TP_HELP_INDEX_PB_OPEN_INDEX,546984460,
 sfx2_PushButton_TP_HELP_SEARCH_PB_OPEN_SEARCH,547000849,
 sfx2_PushButton_TP_HELP_SEARCH_PB_SEARCH,547000844,
-starmath_CheckBox_RID_FONTDIALOG_1,1401455617,
-starmath_CheckBox_RID_FONTDIALOG_2,1401455618,
-starmath_ComboBox_RID_FONTDIALOG_1,1401458689,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_1,1401573377,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_2,1401573378,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_3,1401573379,
@@ -6510,7 +6506,6 @@ starmath_ComboBox_RID_SYMDEFINEDIALOG_4,1401573380,
 starmath_ComboBox_RID_SYMDEFINEDIALOG_5,1401573381,
 starmath_ListBox_RID_SYMDEFINEDIALOG_1,1401572865,
 starmath_ListBox_RID_SYMDEFINEDIALOG_LB_FONTS_SUBSET,1401572975,
-starmath_ModalDialog_RID_FONTDIALOG,1401454592,
 starmath_ModalDialog_RID_SYMDEFINEDIALOG,1401569280,
 starmath_PushButton_RID_SYMDEFINEDIALOG_1,1401573889,
 starmath_PushButton_RID_SYMDEFINEDIALOG_2,1401573890,
diff --git a/source/text/smath/01/05010100.xhp 
b/source/text/smath/01/05010100.xhp
index 0c3e3a3..a15adf9 100644
--- a/source/text/smath/01/05010100.xhp
+++ b/source/text/smath/01/05010100.xhp
@@ -34,20 +34,20 @@
   
   
   
-  bookmark branch=hid/starmath:ModalDialog:RID_FONTDIALOG xml-lang=en-US 
id=bm_id3153144 localize=false/paragraph role=heading level=1 
id=hd_id3153188 l10n=U xml-lang=en-US oldref=1Fonts/paragraph
-  paragraph l10n=U role=paragraph id=par_id3152598 xml-lang=en-US 
oldref=2ahelp visibility=visible 
hid=STARMATH_MODALDIALOG_RID_FONTDIALOGUse this dialog to select the font 
for the respective category in the emphFonts/emph 
dialog./ahelp/paragraph
+  bookmark branch=hid/modules/smath/ui/fontdialog/FontDialog 
xml-lang=en-US id=bm_id3153144 localize=false/paragraph role=heading 
level=1 id=hd_id3153188 l10n=U xml-lang=en-US 
oldref=1Fonts/paragraph
+  paragraph l10n=U role=paragraph id=par_id3152598 xml-lang=en-US 
oldref=2ahelp visibility=visible 
hid=modules/smath/ui/fontdialog/FontDialogUse this dialog to select the font 
for the respective category in the emphFonts/emph 
dialog./ahelp/paragraph
   section id=howtoget
   embed href=text/smath/00/0004.xhp#fmtssa/
 /section
-  bookmark branch=hid/starmath:ComboBox:RID_FONTDIALOG:1 xml-lang=en-US 
id=bm_id3155064 localize=false/paragraph role=heading level=2 
id=hd_id3149124 l10n=U xml-lang=en-US oldref=3Font/paragraph
-  paragraph l10n=U role=paragraph id=par_id3153713 xml-lang=en-US 
oldref=4ahelp hid=STARMATH_COMBOBOX_RID_FONTDIALOG_1 
visibility=visibleSelect a font from the list./ahelp/paragraph
+  bookmark branch=hid/modules/smath/ui/fontdialog/font xml-lang=en-US 
id=bm_id3155064 localize=false/paragraph role=heading level=2 
id=hd_id3149124 l10n=U xml-lang=en-US oldref=3Font/paragraph
+  paragraph l10n=U role=paragraph id=par_id3153713 xml-lang=en-US 
oldref=4ahelp hid=modules/smath/ui/fontdialog/font 
visibility=visibleSelect a font from the list./ahelp/paragraph
   paragraph role=heading level=2 id=hd_id3154702 l10n=U 
xml-lang=en-US oldref=5Example/paragraph
   paragraph role=paragraph id=par_id3154020 l10n=U xml-lang=en-US 
oldref=6You can see a preview of the selected font with its 
attributes./paragraph
   paragraph role=heading level=2 id=hd_id3154656 l10n=U 
xml-lang=en-US oldref=7Attributes/paragraph
   paragraph role=paragraph id=par_id3150208 l10n=U xml-lang=en-US 
oldref=8You can assign additional attributes to the selected 
font./paragraph
-  bookmark branch=hid/starmath:CheckBox:RID_FONTDIALOG:1 xml-lang=en-US 
id=bm_id3148700 localize=false/paragraph role=heading level=3 
id=hd_id3154486 l10n=U xml-lang=en-US oldref=9Bold/paragraph
-  paragraph l10n=U role=paragraph id=par_id3148839 xml-lang=en-US 
oldref=10ahelp hid=STARMATH_CHECKBOX_RID_FONTDIALOG_1 
visibility=visibleCheck this box to assign the bold attribute to the 
font./ahelp/paragraph
-  bookmark branch=hid/starmath:CheckBox:RID_FONTDIALOG:2 xml-lang=en-US 
id=bm_id3150210 localize=false/paragraph role=heading level=3 
id=hd_id3148868 l10n=U xml-lang=en-US oldref=11Italic/paragraph
-  paragraph l10n=U role=paragraph id=par_id3149126 xml-lang=en-US 
oldref=12ahelp hid=STARMATH_CHECKBOX_RID_FONTDIALOG_2 

[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared

2013-11-01 Thread Tor Lillqvist
 
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
 |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 42b060d8ea3819ac04dae87b8cccd16397a9ba88
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Nov 1 14:50:40 2013 +0200

Saving the graphics state around touch_lo_draw_tile() seems unnecessary

Change-Id: Ic1a6cf64fb05810eccc91d0095c9ced54d3d9fe1

diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
index 864244e..0c18b82 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
@@ -45,15 +45,12 @@
 {
 CGContextRef context = UIGraphicsGetCurrentContext();
 
-CGContextSaveGState(context);
 touch_lo_draw_tile(context,
self.tester.params.contextWidth,
self.tester.params.contextHeight,

MLODpxPointByDpxes(self.tester.params.tilePosX,self.tester.params.tilePosY),

MLODpxSizeByDpxes(self.tester.params.tileWidth,self.tester.params.tileHeight));
 
-CGContextRestoreGState(context);
-
 MLODpxSize size = touch_lo_get_content_size();
 NSLog(@touch_lo_get_content_size: width=%f, height=%f,size.width, 
size.height);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Compiling LibreOffice 4.1.2.3 on Solaris

2013-11-01 Thread Eric Bautsch

Hi Norbert and Stephan.

The LD_LIBRARY_PATH looks fine to me:

   [build IDL] udkapi/com/sun/star/idl
   mkdir -p
   
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/workdir/unxsogi.pro/UnoApiPartTarget/udkapi/com/sun/star/
RESPONSEFILE=/tmp/gbuild.LYKziC 
   
SOLARBINDIR=/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/bin
   
LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib:/export/home/bautsche/libre-office/libreoffice-4.1.2.3/instdir/unxsogi.pro/program
   
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/bin/idlc
   -I/export/home/bautsche/libre-office/libreoffice-4.1.2.3/udkapi -M
   
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/workdir/unxsogi.pro/Dep/UnoApiPartTarget/udkapi/com/sun/star/
   -O
   
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/workdir/unxsogi.pro/UnoApiPartTarget/udkapi/com/sun/star/
   -verbose @${RESPONSEFILE}  /dev/null  rm -f ${RESPONSEFILE}  touch
   
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/workdir/unxsogi.pro/UnoApiPartTarget/udkapi/com/sun/star/idl.done
   ld.so.1: idlc: fatal: relocation error: file
   
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/bin/idlc:
   symbol rtl_string_new: referenced symbol not found
   /bin/sh: line 1: 2360: Killed
   make[1]: ***
   
[/export/home/bautsche/libre-office/libreoffice-4.1.2.3/workdir/unxsogi.pro/UnoApiPartTarget/udkapi/com/sun/star/idl.done]
   Killed
   make[1]: Leaving directory
   `/export/home/bautsche/libre-office/libreoffice-4.1.2.3'
   gmake: *** [build] Error 2
   bautsche@cressida $ ls -la
   /export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib
   total 654
   drwxr-xr-x 2 bautsche user 11 Oct 31 12:12 ./
   drwxr-xr-x 4 bautsche user 4 Oct 31 12:12 ../
   -rw-r--r-- 1 bautsche user 66712 Oct 31 12:12 libcodemaker.a
   -rw-r--r-- 1 bautsche user 25514 Oct 31 12:12 libcodemaker_cpp.a
   -rwxr-xr-x 1 bautsche user 133221 Oct 31 12:12 libreglo.so*
   -rwxr-xr-x 1 bautsche user 161724 Oct 31 12:12 libstorelo.so*
   lrwxrwxrwx 1 bautsche user 15 Oct 31 12:12 libuno_sal.so - libuno_sal.so.3*
   -rwxr-xr-x 1 bautsche user 377081 Oct 31 12:12 libuno_sal.so.3*
   lrwxrwxrwx 1 bautsche user 25 Oct 31 12:12 libuno_salhelpergcc3.so -
   libuno_salhelpergcc3.so.3*
   -rwxr-xr-x 1 bautsche user 36660 Oct 31 12:12 libuno_salhelpergcc3.so.3*
   -rwxr-xr-x 1 bautsche user 229716 Oct 31 12:12 libunoidllo.so*
   bautsche@cressida $

Also:

   bautsche@cressida $ readelf -d solver/unxsogi.pro/bin/idlc

   Dynamic section at offset 0x3a6a0 contains 29 entries:
   Tag Type Name/Value
   0x0001 (NEEDED) Shared library: [libnsl.so.1]
   0x0001 (NEEDED) Shared library: [libsocket.so.1]
   0x0001 (NEEDED) Shared library: [libreglo.so]
   0x0001 (NEEDED) Shared library: [libuno_sal.so.3]
   0x0001 (NEEDED) Shared library: [libuno_salhelpergcc3.so.3]
   0x0001 (NEEDED) Shared library: [libstdc++.so.6]
   0x0001 (NEEDED) Shared library: [libm.so.2]
   0x0001 (NEEDED) Shared library: [libgcc_s.so.1]
   0x0001 (NEEDED) Shared library: [libc.so.1]
   0x000f (RPATH) Library rpath:
   
[$ORIGIN/../../ure-link/lib:/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib]
   0x000c (INIT) 0x804a140
   0x000d (FINI) 0x8072500
   0x6ef5 (GNU_HASH) 0x80480e8
   0x0005 (STRTAB) 0x8048be0
   0x0006 (SYMTAB) 0x80481b0
   0x000a (STRSZ) 3438 (bytes)
   0x000b (SYMENT) 16 (bytes)
   0x0015 (DEBUG) 0x0
   0x0003 (PLTGOT) 0x80837b0
   0x0002 (PLTRELSZ) 1096 (bytes)
   0x0014 (PLTREL) REL
   0x0017 (JMPREL) 0x8049cec
   0x0011 (REL) 0x8049b94
   0x0012 (RELSZ) 344 (bytes)
   0x0013 (RELENT) 8 (bytes)
   0x6ffe (VERNEED) 0x8049a94
   0x6fff (VERNEEDNUM) 4
   0x6ff0 (VERSYM) 0x804994e
   0x (NULL) 0x0
   bautsche@cressida $ ldd solver/unxsogi.pro/bin/idlc
   libnsl.so.1 = /lib/libnsl.so.1
   libsocket.so.1 = /lib/libsocket.so.1
   libreglo.so =
   
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libreglo.so
   libuno_sal.so.3 =
   
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libuno_sal.so.3
   libuno_salhelpergcc3.so.3 =
   
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libuno_salhelpergcc3.so.3
   libstdc++.so.6 = /usr/lib/libstdc++.so.6
   libm.so.2 = /lib/libm.so.2
   libgcc_s.so.1 = /usr/lib/libgcc_s.so.1
   libc.so.1 = /lib/libc.so.1
   libstorelo.so =
   
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libstorelo.so
   libpthread.so.1 = /lib/libpthread.so.1
   bautsche@cressida $



I wonder whether some of the macro magic that Norbert Thiebaud mentioned (and 
that I have no idea how to make sense of) in sal/rtl/strtmpl.cxx isn't working 
for me on Solaris?


Eric



On 

[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - 2 commits - ios/shared

2013-11-01 Thread Ptyl Dragon
 ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h 
 |6 
 ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m 
 |   25 ++-
 
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.h
 |7 
 
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
 |   82 --
 4 files changed, 100 insertions(+), 20 deletions(-)

New commits:
commit 9e274de101a5b35665973a6cb17f41a85d2cd25f
Author: Ptyl Dragon p...@cloudon.com
Date:   Fri Nov 1 15:19:42 2013 +0200

added linking of width and height

Change-Id: I2282fcfffed5c17eb1798d3198d6f04dc27208e9

diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
index df0f70b..8465b5d 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
@@ -8,12 +8,15 @@
 
 #import MLOObject.h
 
+typedef enum {WIDTH_IS_HEIGHT,WIDTH_IS_NOT_HEIGHT} 
MLOTestingTileParametersMode;
+#define MLOTestingTileParametersModeString(enum) 
[@[@WIDTH_IS_HEIGHT,@WIDTH_IS_NOT_HEIGHT] objectAtIndex:enum]
+
 typedef void (^MLOTestingTileParameterExtractor)(CGFloat value);
 
 @class MLOTestingTileParametersViewController;
 @interface MLOTestingTileParameter : MLOObject
--(MLOTestingTileParameter 
*)initWithParams:(MLOTestingTileParametersViewController *) params 
label:(NSString *)label extractor1:(MLOTestingTileParameterExtractor) extractor 
extractor2:(MLOTestingTileParameterExtractor) linkedExtractor 
defaultValue:(NSInteger) defaultValue;
--(void)extract:(BOOL) isExtractor1;
+-(MLOTestingTileParameter 
*)initWithParams:(MLOTestingTileParametersViewController *) params 
label:(NSString *)label 
widthIsNotHeightExtractor:(MLOTestingTileParameterExtractor) 
widthIsNotHeightExtractor 
widthIsHeightExtractor:(MLOTestingTileParameterExtractor) 
widthIsHeightExtractor defaultValue:(NSInteger) defaultValue;
+-(void)extractMode:(MLOTestingTileParametersMode) mode;
 -(void)setParamFrame:(CGRect)  paramFrame;
 -(void)addToSuperview;
 @end
diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
index b5fcd8d..9c0af4f 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
@@ -11,8 +11,8 @@
 
 @interface MLOTestingTileParameter ()
 @property MLOTestingTileParametersViewController * params;
-@property (nonatomic,strong) MLOTestingTileParameterExtractor extractor1;
-@property (nonatomic,strong) MLOTestingTileParameterExtractor extractor2;
+@property (nonatomic,strong) MLOTestingTileParameterExtractor 
widthIsHeightExtractor;
+@property (nonatomic,strong) MLOTestingTileParameterExtractor 
widthIsNotHeightExtractor;
 @property UILabel * label;
 @property UITextField * data;
 @property UITextField * step;
@@ -25,13 +25,13 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
 
 @implementation MLOTestingTileParameter
 
--(MLOTestingTileParameter 
*)initWithParams:(MLOTestingTileParametersViewController *) params 
label:(NSString *)label extractor1:(MLOTestingTileParameterExtractor) 
extractor1 extractor2:(MLOTestingTileParameterExtractor) extractor2 
defaultValue:(NSInteger) defaultValue{
+-(MLOTestingTileParameter 
*)initWithParams:(MLOTestingTileParametersViewController *) params 
label:(NSString *)label 
widthIsNotHeightExtractor:(MLOTestingTileParameterExtractor) 
widthIsNotHeightExtractor 
widthIsHeightExtractor:(MLOTestingTileParameterExtractor) 
widthIsHeightExtractor defaultValue:(NSInteger) defaultValue{
 NSLog(@Creating tile testing param %@ with default value 
%d,label,defaultValue);
 self = [self init];
 if(self){
 self.params = params;
-self.extractor1 = extractor1;
-self.extractor2 = extractor2;
+self.widthIsHeightExtractor = widthIsHeightExtractor;
+self.widthIsNotHeightExtractor = widthIsNotHeightExtractor;
 self.defaultValue = defaultValue;
 [self initLabel:label];
 self.dataStepper = [self createStepper];
@@ -169,16 +169,20 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
 return [self.data.text floatValue];
 }
 
--(void)extract:(BOOL) isExtractor1{
-
-NSLog(@%@ extract %d,self,isExtractor1?1:2);
-
-CGFloat dataValue = [self currentDataValue];
+-(MLOTestingTileParameterExtractor) 
getExtractor:(MLOTestingTileParametersMode) mode{
+switch (mode) {
+case WIDTH_IS_HEIGHT:
+return self.widthIsHeightExtractor;
+case WIDTH_IS_NOT_HEIGHT:
+return self.widthIsNotHeightExtractor;
+  

[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared

2013-11-01 Thread Ptyl Dragon
 ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h 
 |1 
 ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m 
 |   12 ++
 
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
 |   19 +++---
 
ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
 |7 +++
 4 files changed, 34 insertions(+), 5 deletions(-)

New commits:
commit 9f1e17cf4f8130fb356de4c69634154d08ea87e7
Author: Ptyl Dragon p...@cloudon.com
Date:   Fri Nov 1 15:55:44 2013 +0200

changed testing app UI to be more clear what it does

Change-Id: I5307478fc47f0810cae24c72ce509ac6a409bf1b

diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
index 8465b5d..041e198 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.h
@@ -19,4 +19,5 @@ typedef void (^MLOTestingTileParameterExtractor)(CGFloat 
value);
 -(void)extractMode:(MLOTestingTileParametersMode) mode;
 -(void)setParamFrame:(CGRect)  paramFrame;
 -(void)addToSuperview;
+-(void)enterMode:(MLOTestingTileParametersMode)mode;
 @end
diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
index 9c0af4f..a661539 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
@@ -185,4 +185,16 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
 extractor([self currentDataValue]);
 }
 }
+-(BOOL)isSupportingMode:(MLOTestingTileParametersMode) mode{
+return [self getExtractor:mode]!=nil;
+}
+-(void)enterMode:(MLOTestingTileParametersMode)mode{
+CGFloat alpha = [self isSupportingMode:mode] ? 1.0f: 0.0f;
+self.label.alpha = alpha;
+self.data.alpha = alpha;
+self.dataStepper.alpha = alpha;
+self.step.alpha =alpha;
+self.stepStepper.alpha = alpha;
+}
+
 @end
diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
index 0c18b82..f8fcadb 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTile.m
@@ -45,11 +45,22 @@
 {
 CGContextRef context = UIGraphicsGetCurrentContext();
 
+MLODpxPoint tilePosition 
=MLODpxPointByDpxes(self.tester.params.tilePosX,self.tester.params.tilePosY);
+MLODpxSize tileSize = 
MLODpxSizeByDpxes(self.tester.params.tileWidth,self.tester.params.tileHeight);
+NSInteger contextWidth = self.tester.params.contextWidth;
+NSInteger contextHeight = self.tester.params.contextHeight;
+
+NSLog(@touch_lo_draw_tile(contextWidth=%d, contextHeight=%d, 
tilePosition=%@, tileSize=%@,
+  contextWidth,
+  contextHeight,
+  NSStringFromCGPoint(tilePosition),
+  NSStringFromCGSize(tileSize));
+
 touch_lo_draw_tile(context,
-   self.tester.params.contextWidth,
-   self.tester.params.contextHeight,
-   
MLODpxPointByDpxes(self.tester.params.tilePosX,self.tester.params.tilePosY),
-   
MLODpxSizeByDpxes(self.tester.params.tileWidth,self.tester.params.tileHeight));
+   contextWidth,
+   contextHeight,
+   tilePosition,
+   tileSize);
 
 MLODpxSize size = touch_lo_get_content_size();
 NSLog(@touch_lo_get_content_size: width=%f, height=%f,size.width, 
size.height);
diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
index 4a235e1..52d7b64 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/testing_tiles/MLOTestingTileParametersViewController.m
@@ -26,11 +26,13 @@ static const CGFloat RENDER_BUTTON_HEIGHT = 50.0f;
 self = [self init];
 if(self){
 self.tester = tester;
-self.mode = WIDTH_IS_HEIGHT;
 [self initParams];
 [self initModeButton];
 [self initRenderButton];
 
+self.mode = WIDTH_IS_NOT_HEIGHT;
+[self changeMode];
+
 }
 
 NSLog(@%@ initWithTester,self);
@@ -96,6 +98,9 @@ static const CGFloat 

Re: Compiling LibreOffice 4.1.2.3 on Solaris

2013-11-01 Thread Stephan Bergmann

On 11/01/2013 02:12 PM, Eric Bautsch wrote:

bautsche@cressida $ ldd solver/unxsogi.pro/bin/idlc
 libnsl.so.1 =   /lib/libnsl.so.1
 libsocket.so.1 =/lib/libsocket.so.1
 libreglo.so =

/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libreglo.so
 libuno_sal.so.3 =

/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libuno_sal.so.3
 libuno_salhelpergcc3.so.3 =

/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libuno_salhelpergcc3.so.3
 libstdc++.so.6 =/usr/lib/libstdc++.so.6
 libm.so.2 = /lib/libm.so.2
 libgcc_s.so.1 = /usr/lib/libgcc_s.so.1
 libc.so.1 = /lib/libc.so.1
 libstorelo.so =

/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libstorelo.so
 libpthread.so.1 =   /lib/libpthread.so.1
bautsche@cressida $


Try ldd -r solver/unxsogi.pro/bin/idlc to force symbol resolution.

Try nm -D solver/unxsogi.pro/lib/libuno_sal.so.3 to see whether it 
exports rtl_string_new.


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


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

2013-11-01 Thread Stephan Bergmann
 xmloff/source/draw/ximpshap.cxx |   89 
 xmloff/source/draw/ximpshap.hxx |2 
 2 files changed, 46 insertions(+), 45 deletions(-)

New commits:
commit dc704d724fc2955a76688f95660522478cacf6e6
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 1 14:56:48 2013 +0100

Directly use OUString

Change-Id: I9029bab2b0ab98a2d78166145a35792e298c9115

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index c46bc2c..d75147c 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -475,7 +475,7 @@ void SdXMLShapeContext::AddShape(uno::Reference 
drawing::XShape  xShape)
 
 }
 
-void SdXMLShapeContext::AddShape(const char* pServiceName )
+void SdXMLShapeContext::AddShape(OUString const  serviceName)
 {
 uno::Reference lang::XMultiServiceFactory  
xServiceFact(GetImport().GetModel(), uno::UNO_QUERY);
 if(xServiceFact.is())
@@ -489,14 +489,14 @@ void SdXMLShapeContext::AddShape(const char* pServiceName 
)
objects after the import into 
com.sun.star.drawing.GraphicObjectShape.
 */
 uno::Reference drawing::XShape  xShape;
-if ( OUString::createFromAscii(pServiceName).compareToAscii( 
com.sun.star.drawing.OLE2Shape ) == 0 
+if ( serviceName == com.sun.star.drawing.OLE2Shape 
  uno::Reference text::XTextDocument (GetImport().GetModel(), 
uno::UNO_QUERY).is() )
 {
 xShape = uno::Reference drawing::XShape 
(xServiceFact-createInstance(com.sun.star.drawing.temporaryForXMLImportOLE2Shape),
 uno::UNO_QUERY);
 }
 else
 {
-xShape = uno::Reference drawing::XShape 
(xServiceFact-createInstance(OUString::createFromAscii(pServiceName)), 
uno::UNO_QUERY);
+xShape = uno::Reference drawing::XShape 
(xServiceFact-createInstance(serviceName), uno::UNO_QUERY);
 }
 if( xShape.is() )
 AddShape( xShape );
@@ -504,7 +504,7 @@ void SdXMLShapeContext::AddShape(const char* pServiceName )
 catch(const uno::Exception e)
 {
 uno::SequenceOUString aSeq( 1 );
-aSeq[0] = OUString::createFromAscii(pServiceName);
+aSeq[0] = serviceName;
 GetImport().SetError( XMLERROR_FLAG_ERROR | XMLERROR_API,
   aSeq, e.Message, NULL );
 }
@@ -1407,33 +1407,33 @@ void SdXMLPathShapeContext::StartElement(const 
uno::Reference xml::sax::XAttrib
 }
 
 // create shape
-const char* pService;
+OUString service;
 
 if(aPolyPolygon.areControlPointsUsed())
 {
 if(aPolyPolygon.isClosed())
 {
-pService = com.sun.star.drawing.ClosedBezierShape;
+service = com.sun.star.drawing.ClosedBezierShape;
 }
 else
 {
-pService = com.sun.star.drawing.OpenBezierShape;
+service = com.sun.star.drawing.OpenBezierShape;
 }
 }
 else
 {
 if(aPolyPolygon.isClosed())
 {
-pService = com.sun.star.drawing.PolyPolygonShape;
+service = com.sun.star.drawing.PolyPolygonShape;
 }
 else
 {
-pService = com.sun.star.drawing.PolyLineShape;
+service = com.sun.star.drawing.PolyLineShape;
 }
 }
 
 // Add, set Style and properties from base shape
-AddShape(pService);
+AddShape(service);
 
 // #89344# test for mxShape.is() and not for mxShapes.is() to 
support
 // shape import helper classes WITHOUT XShapes (member 
mxShapes). This
@@ -1525,7 +1525,7 @@ void SdXMLTextBoxShapeContext::StartElement(const 
uno::Reference xml::sax::XAtt
 sal_Bool bIsPresShape = sal_False;
 bool bClearText = false;
 
-const char *pService = NULL;
+OUString service;
 
 if( isPresentationShape() )
 {
@@ -1535,59 +1535,59 @@ void SdXMLTextBoxShapeContext::StartElement(const 
uno::Reference xml::sax::XAtt
 if( IsXMLToken( maPresentationClass, XML_PRESENTATION_SUBTITLE ))
 {
 // XmlShapeTypePresSubtitleShape
-pService = com.sun.star.presentation.SubtitleShape;
+service = com.sun.star.presentation.SubtitleShape;
 }
 else if( IsXMLToken( maPresentationClass, XML_PRESENTATION_OUTLINE 
) )
 {
 // XmlShapeTypePresOutlinerShape
-pService = com.sun.star.presentation.OutlinerShape;
+ 

[Libreoffice-commits] core.git: Branch 'feature/tiledrendering' - ios/shared

2013-11-01 Thread Ptyl Dragon
 ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m 
|8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4ba4d45da9f1f1df28fd68a29091e57bd30a9d61
Author: Ptyl Dragon p...@cloudon.com
Date:   Fri Nov 1 16:11:21 2013 +0200

fix less than 1 step limit

Change-Id: Ic5fd714ff975b6e5afbe7ff78f3fc1da398a658d

diff --git 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
index a661539..89267e5 100644
--- 
a/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
+++ 
b/ios/shared/ios_sharedlo/objective_c/view_controllers/MLOTestingTileParameter.m
@@ -34,18 +34,18 @@ static const CGFloat DEFAULT_STEP_VALUE = 1;
 self.widthIsNotHeightExtractor = widthIsNotHeightExtractor;
 self.defaultValue = defaultValue;
 [self initLabel:label];
-self.dataStepper = [self createStepper];
-self.stepStepper = [self createStepper];
+self.dataStepper = [self stepperWithMinValue:-MAXFLOAT];
+self.stepStepper = [self stepperWithMinValue:1];
 [self initDataTextField];
 [self initStepTextField];
 }
 return self;
 }
 
--(UIStepper *) createStepper{
+-(UIStepper *) stepperWithMinValue:(CGFloat) minValue{
 UIStepper * stepper = [UIStepper new];
 stepper.maximumValue = MAXFLOAT;
-stepper.minimumValue = -MAXFLOAT;
+stepper.minimumValue = minValue;
 stepper.stepValue = DEFAULT_STEP_VALUE;
 stepper.autorepeat = YES;
 stepper.continuous = NO;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Caolán McNamara
 sc/source/core/tool/interpr2.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 3b27470860cfa377dfc0cb940bba204d827434ad
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 13:10:39 2013 +

Resolves: fdo#71106 editing dde function crashes

Change-Id: Id2f4bffb7de7201ddeb8f75daaa2723cc42c59b0

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 3d13382..8a3bc40 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2040,7 +2040,7 @@ void ScInterpreter::ScDde()
 //! Dde-Links (zusaetzlich) effizienter am Dokument speichern !
 //  ScDdeLink* pLink = pDok-GetDdeLink( aAppl, aTopic, aItem );
 
-bool bWasError = ( pMyFormulaCell-GetRawError() != 0 );
+bool bWasError = ( pMyFormulaCell  pMyFormulaCell-GetRawError() != 
0 );
 
 if (!pLink)
 {
@@ -2056,19 +2056,23 @@ void ScInterpreter::ScDde()
 //! asynchron auswerten ???
 pLink-TryUpdate(); //  TryUpdate ruft Update nicht mehrfach 
auf
 
-// StartListening erst nach dem Update, sonst circular reference
-pMyFormulaCell-StartListening( *pLink );
+if (pMyFormulaCell)
+{
+// StartListening erst nach dem Update, sonst circular 
reference
+pMyFormulaCell-StartListening( *pLink );
+}
 }
 else
 {
-pMyFormulaCell-StartListening( *pLink );
+if (pMyFormulaCell)
+pMyFormulaCell-StartListening( *pLink );
 }
 
 //  Wenn aus dem Reschedule beim Ausfuehren des Links ein Fehler
 //  (z.B. zirkulaere Referenz) entstanden ist, der vorher nicht da war,
 //  das Fehler-Flag zuruecksetzen:
 
-if ( pMyFormulaCell-GetRawError()  !bWasError )
+if ( pMyFormulaCell  pMyFormulaCell-GetRawError()  !bWasError )
 pMyFormulaCell-SetErrCode(0);
 
 //  Wert abfragen
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Compiling LibreOffice 4.1.2.3 on Solaris

2013-11-01 Thread Stephan Bergmann

On 11/01/2013 03:24 PM, Eric Bautsch wrote:

On 01/11/2013 13:55, Stephan Bergmann wrote:

Try ldd -r solver/unxsogi.pro/bin/idlc to force symbol resolution.



bautsche@cressida $ ldd -r solver/unxsogi.pro/bin/idlc

[...]

 libuno_sal.so.3 =

/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libuno_sal.so.3

[...]

 symbol not found: osl_getProcessInfo
(solver/unxsogi.pro/bin/idlc)



Try nm -D solver/unxsogi.pro/lib/libuno_sal.so.3 to see whether it
exports rtl_string_new.



bautsche@cressida $ nm -D solver/unxsogi.pro/lib/libuno_sal.so.3

[...]

[336]   |252720|   449|FUNC |GLOB |0|11 |osl_getProcessInfo

[...]

So solver/unxsogi.pro/lib/libuno_sal.so.3 exports osl_getProcessInfo 
etc. but solver/unxsogi.pro/bin/idlc doesn't find it.  Try LD_DEBUG=all 
-r solver/unxsogi.pro/bin/idlc log to get (lots of) detailed output of 
what the loader actually does and grep the generated log e.g. for the 
lines where it says it does not find osl_getProcessInfo.


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


[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b2/7ff0a078b7c1b32e88041f25314eaad267618b

2013-11-01 Thread Caolán McNamara
 b2/7ff0a078b7c1b32e88041f25314eaad267618b |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e548ba75fe1f4b9d8c2d2cc332c9a6eec325714b
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 14:48:43 2013 +

Notes added by 'git notes add'

diff --git a/b2/7ff0a078b7c1b32e88041f25314eaad267618b 
b/b2/7ff0a078b7c1b32e88041f25314eaad267618b
new file mode 100644
index 000..36e98f2
--- /dev/null
+++ b/b2/7ff0a078b7c1b32e88041f25314eaad267618b
@@ -0,0 +1 @@
+merged as: 0921642e7f15d3abf6a96e19529b313cf8fd1a8e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Caolán McNamara
 sw/source/core/text/inftxt.cxx |   13 +
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 55369420bd488411dd5428a66f4ad70c2ef9b007
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 15:05:15 2013 +

stop unbalanced OutputDevice Push/Pop warnings on closing help

where it takes the early GetBackColor return after Push but before Pop

Change-Id: I5fac78b7270c8561cb8e7d26bd2bff44628c8547

diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx
index 7ee6c80..1ff5a9c 100644
--- a/sw/source/core/text/inftxt.cxx
+++ b/sw/source/core/text/inftxt.cxx
@@ -1182,17 +1182,22 @@ void SwTxtPaintInfo::DrawBackBrush( const SwLinePortion 
rPor ) const
 // #i16816# tagged pdf support
 SwTaggedPDFHelper aTaggedPDFHelper( 0, 0, 0, *pTmpOut );
 
-pTmpOut-Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
+Color aFillColor;
 
 if( m_pFnt-GetHighlightColor() != COL_TRANSPARENT )
 {
-pTmpOut-SetFillColor( m_pFnt-GetHighlightColor() );
+aFillColor = m_pFnt-GetHighlightColor();
 }
 else
 {
-if( !m_pFnt-GetBackColor() ) return;
-pTmpOut-SetFillColor( *m_pFnt-GetBackColor() );
+if( !m_pFnt-GetBackColor() )
+return;
+aFillColor = *m_pFnt-GetBackColor();
 }
+
+pTmpOut-Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
+
+pTmpOut-SetFillColor(aFillColor);
 pTmpOut-SetLineColor();
 
 DrawRect( aIntersect, sal_True, sal_False );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: Compiling LibreOffice 4.1.2.3 on Solaris

2013-11-01 Thread Stephan Bergmann

On 11/01/2013 03:48 PM, Eric Bautsch wrote:

Output from LD_DEBUG=all ldd -r solver/unxsogi.pro/bin/idlc log 21
attached.


Unfortunately doesn't give a clue why the loader refuses to pick the 
symobls from libuno_sal.so.3.


The last idea I have is that there's something wrong with the symbol 
versions.



02205: file=libuno_sal.so.3;  needed by solver/unxsogi.pro/bin/idlc
02205:
02205: find object=libuno_sal.so.3; searching
02205:  search 
path=$ORIGIN/../../ure-link/lib:/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib
  (RUNPATH/RPATH from file solver/unxsogi.pro/bin/idlc)
02205:  trying 
path=/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/bin/../../ure-link/lib/libuno_sal.so.3
02205:  trying 
path=/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libuno_sal.so.3
libuno_sal.so.3 =
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libuno_sal.so.3
02205: 
file=/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libuno_sal.so.3
  [ ELF ]; generating link map
02205: addr: 0xfe4e4000  size:  0x4e38c
02205: lmid:   BASE  lmco: 0x10
02205:
02205: version needed processing: file=solver/unxsogi.pro/bin/idlc
02205: fileversion
02205: libuno_sal.so.3 LIBO_UDK_4.1
02205: libuno_sal.so.3 UDK_3.6
02205: libuno_sal.so.3 LIBO_UDK_4.0
02205: libuno_sal.so.3 PRIVATE_1.1
02205: libuno_sal.so.3 UDK_3_0_0


indicates that idlc does expect to see versioned symbols from 
libuno_sal.so.3, but I forgot what the Solaris command is to see what 
versions the symbols exported/required by an object should have (psv? 
pvs? something like that), and whether there's an LD_DEBUG argument in 
addition to all on Solaris to make it output information about symbol 
resolution version mismatch.


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


[Bug 67274] Gallery: Do not link inserted images

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=67274

Samuel M. s.mehrbr...@gmail.com changed:

   What|Removed |Added

 CC||libreoffice@lists.freedeskt
   ||op.org

--- Comment #6 from Samuel M. s.mehrbr...@gmail.com ---
(Adding the Dev list to CC)
I'd need some help with the Fix for this bug. Can someone have a look at
Comment 5 and help me with this?

-- 
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: include/svx

2013-11-01 Thread Stephan Bergmann
 include/svx/svdmodel.hxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 1f0f538b20adbb6b3703150be3e202cd03f3d6de
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 1 16:53:49 2013 +0100

Remove dead declaration w/o a definition

Change-Id: Ic0a1f07a2e16695fafbd63414397a8565d7c6861

diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 1516a08..7e92d5c 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -221,9 +221,6 @@ public:
 // create a new, unique comment ID
 sal_uInt32 GetNextUniqueCommentID();
 
-// get the author name
-OUString GetDocumentAuthorName() const;
-
 // for export
 sal_uInt32 GetUniqueCommentID() const { return mnUniqueCommentID; }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Stephan Bergmann
 svx/source/unodraw/unomod.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1754344c88c15c431307fe82f475d3c5312b9f8f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri Nov 1 17:02:34 2013 +0100

Some Trivial clean-up

Change-Id: Ie48e8f5cbc455ef267ad756d82f8c0efee0ef065

diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 2c7fef5..85b2e77 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -171,9 +171,7 @@ sal_Bool SvxUnoDrawMSFactory::createEvent( const SdrModel* 
pDoc, const SdrHint*
 uno::Reference uno::XInterface  SAL_CALL 
SvxUnoDrawMSFactory::createInstance( const OUString rServiceSpecifier )
 throw( uno::Exception, uno::RuntimeException )
 {
-const OUString aDrawingPrefix(com.sun.star.drawing.);
-
-if( rServiceSpecifier.startsWith( aDrawingPrefix ) )
+if( rServiceSpecifier.startsWith(com.sun.star.drawing.) )
 {
 sal_uInt32 nType = UHashMap::getId( rServiceSpecifier );
 if( nType != UHASHMAP_NOTFOUND )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 70998] Termchange: Graphic/Picture - Image

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=70998

--- Comment #8 from Stanislav Horacek stanislav.hora...@gmail.com ---
I'm confused now. In case of sentence capitalizing, there should be lowercase
i if it is not the first word
(https://developer.gnome.org/hig-book/3.2/design-text-labels.html.en#layout-capitalization)
- or not?

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2013-11-01 Thread Julien Nabet
 connectivity/source/drivers/firebird/ResultSet.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 124beed4078231867f8327e34b90ee1f40c39a30
Author: Julien Nabet serval2...@yahoo.fr
Date:   Fri Nov 1 17:58:56 2013 +0100

Resolves: fdo#71062 Embedded Firebird - Tables with Date-fields let LO crash

Change-Id: Ie28a1e8765ab9ff6eb345198d6ea223e25429e11

diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx 
b/connectivity/source/drivers/firebird/ResultSet.cxx
index 2acaac6..f07048a 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -417,7 +417,7 @@ ORowSetValue OResultSet::retrieveValue(const sal_Int32 
nColumnIndex, const ISC_S
 case SQL_TYPE_TIME:
 return getTime(nColumnIndex);
 case SQL_TYPE_DATE:
-return getTime(nColumnIndex);
+return getDate(nColumnIndex);
 case SQL_INT64:
 return getLong(nColumnIndex);
 case SQL_BLOB:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/inc sc/qa sc/source

2013-11-01 Thread Kohei Yoshida
 sc/inc/rangenam.hxx  |5 +
 sc/qa/unit/ucalc_formula.cxx |   13 +++--
 sc/source/core/tool/rangenam.cxx |   20 
 3 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit b3fd5efef2ade574d33cc1ac39e832ccca14a569
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Nov 1 13:28:00 2013 -0400

We need to update sheet positions of range names when modifying sheets.

And add Dump() to ScRangeData for debugging convenience and re-enable
previously failed test cases.

Change-Id: I9d8f41a8be4c9c301254ef300c7b7f0c1ea7f393

diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index 65fae47..6113709 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -24,6 +24,7 @@
 #include address.hxx
 #include formula/grammar.hxx
 #include scdllapi.h
+#include calcmacros.hxx
 
 #include map
 #include vector
@@ -151,6 +152,10 @@ public:
 SCCOL GetMaxCol() const;
 
 voidCompileUnresolvedXML();
+
+#if DEBUG_FORMULA_COMPILER
+void Dump() const;
+#endif
 };
 
 inline bool ScRangeData::HasType( RangeType nType ) const
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index ce9ce2e..361c015 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1262,20 +1262,29 @@ void Test::testFormulaRefUpdateNamedExpression()
 m_pDoc-SetValue(ScAddress(3,9,0), 20);
 CPPUNIT_ASSERT_EQUAL(43.0, m_pDoc-GetValue(ScAddress(2,7,0)));
 
-#if 0
 // Insert a new sheet before the current.
 m_pDoc-InsertTab(0, New);
 OUString aName;
 m_pDoc-GetName(1, aName);
 CPPUNIT_ASSERT_EQUAL(OUString(Formula), aName);
+
+pName = pGlobalNames-findByUpperName(MYRANGE);
+CPPUNIT_ASSERT_MESSAGE(Failed to find named expression 'MyRange' in the 
global scope., pName);
+
 m_pDoc-SetValue(ScAddress(3,9,1), 10);
 CPPUNIT_ASSERT_EQUAL(33.0, m_pDoc-GetValue(ScAddress(2,7,1)));
 
 m_pDoc-DeleteTab(0);
 
+aName = OUString();
+m_pDoc-GetName(0, aName);
+CPPUNIT_ASSERT_EQUAL(OUString(Formula), aName);
+
+pName = pGlobalNames-findByUpperName(MYRANGE);
+CPPUNIT_ASSERT_MESSAGE(Failed to find named expression 'MyRange' in the 
global scope., pName);
+
 m_pDoc-SetValue(ScAddress(3,9,0), 11);
 CPPUNIT_ASSERT_EQUAL(34.0, m_pDoc-GetValue(ScAddress(2,7,0)));
-#endif
 
 // Clear all and start over.
 clearRange(m_pDoc, ScRange(0,0,0,100,100,0));
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index b963eab..4389a4b 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -196,6 +196,18 @@ void ScRangeData::CompileUnresolvedXML()
 }
 }
 
+#if DEBUG_FORMULA_COMPILER
+void ScRangeData::Dump() const
+{
+cout  -- ScRangeData  endl;
+coutname:   aName  endl;
+coutref position: (col=  aPos.Col()  , row=  aPos.Row()  
, sheet=  aPos.Tab()  )  endl;
+
+if (pCode)
+pCode-Dump();
+}
+#endif
+
 void ScRangeData::GuessPosition()
 {
 // set a position that allows absoluting of all relative references
@@ -392,6 +404,9 @@ void ScRangeData::UpdateInsertTab( 
sc::RefUpdateInsertTabContext rCxt, SCTAB nL
 sc::RefUpdateResult aRes = pCode-AdjustReferenceOnInsertedTab(rCxt, aPos);
 if (aRes.mbReferenceModified)
 rCxt.maUpdatedNames.setUpdatedName(nLocalTab, nIndex);
+
+if (rCxt.mnInsertPos = aPos.Tab())
+aPos.IncTab(rCxt.mnSheets);
 }
 
 void ScRangeData::UpdateDeleteTab( sc::RefUpdateDeleteTabContext rCxt, SCTAB 
nLocalTab )
@@ -399,6 +414,9 @@ void ScRangeData::UpdateDeleteTab( 
sc::RefUpdateDeleteTabContext rCxt, SCTAB nL
 sc::RefUpdateResult aRes = pCode-AdjustReferenceOnDeletedTab(rCxt, aPos);
 if (aRes.mbReferenceModified)
 rCxt.maUpdatedNames.setUpdatedName(nLocalTab, nIndex);
+
+if (rCxt.mnDeletePos = aPos.Tab())
+aPos.IncTab(-rCxt.mnSheets);
 }
 
 void ScRangeData::UpdateMoveTab( sc::RefUpdateMoveTabContext rCxt, SCTAB 
nLocalTab )
@@ -406,6 +424,8 @@ void ScRangeData::UpdateMoveTab( 
sc::RefUpdateMoveTabContext rCxt, SCTAB nLocal
 sc::RefUpdateResult aRes = pCode-AdjustReferenceOnMovedTab(rCxt, aPos);
 if (aRes.mbReferenceModified)
 rCxt.maUpdatedNames.setUpdatedName(nLocalTab, nIndex);
+
+aPos.SetTab(rCxt.getNewTab(aPos.Tab()));
 }
 
 void ScRangeData::MakeValidName( OUString rName )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread mulei
 sc/qa/unit/data/xls/opencl/financial/PMT.xls |binary
 sc/qa/unit/opencl-test.cxx   |   25 +
 sc/source/core/opencl/op_financial.cxx   |  130 +--
 3 files changed, 127 insertions(+), 28 deletions(-)

New commits:
commit 35f8d734dd54cafd1e9d07a1e67b63c366b93a9d
Author: mulei mu...@multicorewareinc.com
Date:   Fri Nov 1 12:02:35 2013 -0500

GPU Calc: implement NAN argument handling in PMT

Change-Id: I1288a20652b4ceb66d90314f7acddb73506dfb43
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com
Signed-off-by: haochen haoc...@multicorewareinc.com

diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index da4845c..69f7d02 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -1837,44 +1837,118 @@ void OpYieldmat::GenSlidingWindowFunction(
 ss  };
 }
 
-void OpPMT::GenSlidingWindowFunction(
-std::stringstream ss, const std::string sSymName, SubArguments 
vSubArguments)
+void OpPMT::GenSlidingWindowFunction(std::stringstream ss,
+const std::string sSymName, SubArguments vSubArguments)
 {
 ss  \ndouble   sSymName;
 ss  _ BinFuncName() (;
 for (unsigned i = 0; i  vSubArguments.size(); i++)
 {
 if (i)
-ss  ,;
+ss  , ;
 vSubArguments[i]-GenSlidingWindowDecl(ss);
 }
-ss  ) {\n\t;
-ss  double tmp = 0;\n\t;
-ssdouble tFv=0,tType=0;\n\t;
-ss  int gid0 = get_global_id(0);\n\t;
- if(vSubArguments.size()==4)
-sstFv=vSubArguments[3]-GenSlidingWindowDeclRef();\n\t;
-else if(vSubArguments.size()==5)
+ss  ) {\n;
+ss  double tmp = 0;\n;
+ss  int gid0 = get_global_id(0);\n;
+ssdouble tmp0,tmp1,tmp2;\n;
+ssdouble tmp3=0,tmp4=0;\n;
+unsigned i = vSubArguments.size();
+size_t nItems = 0;
+ss \n;
+//while (i--  1)
+for (size_t i = 0; i  vSubArguments.size(); i++)
 {
-sstType=vSubArguments[4]-GenSlidingWindowDeclRef();
-ss;\n\t;
-sstFv=vSubArguments[3]-GenSlidingWindowDeclRef();
-ss;\n\t;
+FormulaToken *pCur = vSubArguments[i]-GetFormulaToken();
+assert(pCur);
+if (pCur-GetType() == formula::svDoubleVectorRef)
+{
+const formula::DoubleVectorRefToken* pDVR =
+dynamic_castconst formula::DoubleVectorRefToken *(pCur);
+size_t nCurWindowSize = pDVR-GetRefRowSize();
+ss  for (int i = ;
+if (!pDVR-IsStartFixed()  pDVR-IsEndFixed()) {
+#ifdef  ISNAN
+ss  gid0; ipDVR-GetArrayLength();
+ssinCurWindowSize   ; i++){\n;
+#else
+ss  gid0; i   nCurWindowSize  ; i++)\n;
+#endif
+} else if (pDVR-IsStartFixed()  !pDVR-IsEndFixed()) {
+#ifdef  ISNAN
+ss  0; ipDVR-GetArrayLength();
+ssi  gid0+ nCurWindowSize  ; i++){\n;
+#else
+ss  0; i  gid0+ nCurWindowSize  ; i++)\n;
+#endif
+} else if (!pDVR-IsStartFixed()  !pDVR-IsEndFixed()){
+#ifdef  ISNAN
+ss  0; i + gid0pDVR-GetArrayLength();
+ss i   nCurWindowSize  ; i++){\n;
+#else
+ss  0; i   nCurWindowSize  ; i++)\n;
+#endif
+}
+else {
+#ifdef  ISNAN
+ss  0; i   nCurWindowSize  ; i++){\n;
+#else
+ss  0; i   nCurWindowSize  ; i++)\n;
+#endif
+}
+nItems += nCurWindowSize;
+}
+else if (pCur-GetType() == formula::svSingleVectorRef)
+{
+#ifdef  ISNAN
+const formula::SingleVectorRefToken* pSVR =
+dynamic_cast const formula::SingleVectorRefToken* (pCur);
+ss  if (gid0pSVR-GetArrayLength()  ){\n;
+#else
+nItems += 1;
+#endif
+}
+else if (pCur-GetType() == formula::svDouble)
+{
+#ifdef  ISNAN
+ss  {\n;
+#endif
+nItems += 1;
+}
+else
+{
+#ifdef  ISNAN
+#endif
+nItems += 1;
+}
+#ifdef  ISNAN
+if(ocPush==vSubArguments[i]-GetFormulaToken()-GetOpCode())
+{
+ss  if (isNan(;
+ss  vSubArguments[i]-GenSlidingWindowDeclRef();
+ss  ))\n;
+ss  tmpi= 0;\n;
+ss  else\n;
+ss  tmpi=vSubArguments[i]-GenSlidingWindowDeclRef();
+ss  ;\n}\n;
+}
+else
+{
+ss  tmpi=vSubArguments[i]-GenSlidingWindowDeclRef();
+ss ;\n;
+}
+#else
+ss  tmpi=vSubArguments[i]-GenSlidingWindowDeclRef();
+ss ;\n;
+
+#endif
 }
-ssif(vSubArguments[0]-GenSlidingWindowDeclRef()==0.0)\n\t;
-ss\treturn (vSubArguments[2]-GenSlidingWindowDeclRef();
-ss+tFv)/;
-

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - 2 commits - sc/qa sc/source

2013-11-01 Thread mulei
 sc/qa/unit/data/xls/opencl/financial/PMT.xls |binary
 sc/qa/unit/opencl-test.cxx   |   25 +
 sc/source/core/opencl/op_financial.cxx   |  130 +--
 3 files changed, 127 insertions(+), 28 deletions(-)

New commits:
commit c68b91a4b6ae7d3d37c181f6956c80738625c710
Author: mulei mu...@multicorewareinc.com
Date:   Fri Nov 1 12:02:35 2013 -0500

GPU Calc: implement NAN argument handling in PMT

Change-Id: I1288a20652b4ceb66d90314f7acddb73506dfb43
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com
Signed-off-by: haochen haoc...@multicorewareinc.com

diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index da4845c..69f7d02 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -1837,44 +1837,118 @@ void OpYieldmat::GenSlidingWindowFunction(
 ss  };
 }
 
-void OpPMT::GenSlidingWindowFunction(
-std::stringstream ss, const std::string sSymName, SubArguments 
vSubArguments)
+void OpPMT::GenSlidingWindowFunction(std::stringstream ss,
+const std::string sSymName, SubArguments vSubArguments)
 {
 ss  \ndouble   sSymName;
 ss  _ BinFuncName() (;
 for (unsigned i = 0; i  vSubArguments.size(); i++)
 {
 if (i)
-ss  ,;
+ss  , ;
 vSubArguments[i]-GenSlidingWindowDecl(ss);
 }
-ss  ) {\n\t;
-ss  double tmp = 0;\n\t;
-ssdouble tFv=0,tType=0;\n\t;
-ss  int gid0 = get_global_id(0);\n\t;
- if(vSubArguments.size()==4)
-sstFv=vSubArguments[3]-GenSlidingWindowDeclRef();\n\t;
-else if(vSubArguments.size()==5)
+ss  ) {\n;
+ss  double tmp = 0;\n;
+ss  int gid0 = get_global_id(0);\n;
+ssdouble tmp0,tmp1,tmp2;\n;
+ssdouble tmp3=0,tmp4=0;\n;
+unsigned i = vSubArguments.size();
+size_t nItems = 0;
+ss \n;
+//while (i--  1)
+for (size_t i = 0; i  vSubArguments.size(); i++)
 {
-sstType=vSubArguments[4]-GenSlidingWindowDeclRef();
-ss;\n\t;
-sstFv=vSubArguments[3]-GenSlidingWindowDeclRef();
-ss;\n\t;
+FormulaToken *pCur = vSubArguments[i]-GetFormulaToken();
+assert(pCur);
+if (pCur-GetType() == formula::svDoubleVectorRef)
+{
+const formula::DoubleVectorRefToken* pDVR =
+dynamic_castconst formula::DoubleVectorRefToken *(pCur);
+size_t nCurWindowSize = pDVR-GetRefRowSize();
+ss  for (int i = ;
+if (!pDVR-IsStartFixed()  pDVR-IsEndFixed()) {
+#ifdef  ISNAN
+ss  gid0; ipDVR-GetArrayLength();
+ssinCurWindowSize   ; i++){\n;
+#else
+ss  gid0; i   nCurWindowSize  ; i++)\n;
+#endif
+} else if (pDVR-IsStartFixed()  !pDVR-IsEndFixed()) {
+#ifdef  ISNAN
+ss  0; ipDVR-GetArrayLength();
+ssi  gid0+ nCurWindowSize  ; i++){\n;
+#else
+ss  0; i  gid0+ nCurWindowSize  ; i++)\n;
+#endif
+} else if (!pDVR-IsStartFixed()  !pDVR-IsEndFixed()){
+#ifdef  ISNAN
+ss  0; i + gid0pDVR-GetArrayLength();
+ss i   nCurWindowSize  ; i++){\n;
+#else
+ss  0; i   nCurWindowSize  ; i++)\n;
+#endif
+}
+else {
+#ifdef  ISNAN
+ss  0; i   nCurWindowSize  ; i++){\n;
+#else
+ss  0; i   nCurWindowSize  ; i++)\n;
+#endif
+}
+nItems += nCurWindowSize;
+}
+else if (pCur-GetType() == formula::svSingleVectorRef)
+{
+#ifdef  ISNAN
+const formula::SingleVectorRefToken* pSVR =
+dynamic_cast const formula::SingleVectorRefToken* (pCur);
+ss  if (gid0pSVR-GetArrayLength()  ){\n;
+#else
+nItems += 1;
+#endif
+}
+else if (pCur-GetType() == formula::svDouble)
+{
+#ifdef  ISNAN
+ss  {\n;
+#endif
+nItems += 1;
+}
+else
+{
+#ifdef  ISNAN
+#endif
+nItems += 1;
+}
+#ifdef  ISNAN
+if(ocPush==vSubArguments[i]-GetFormulaToken()-GetOpCode())
+{
+ss  if (isNan(;
+ss  vSubArguments[i]-GenSlidingWindowDeclRef();
+ss  ))\n;
+ss  tmpi= 0;\n;
+ss  else\n;
+ss  tmpi=vSubArguments[i]-GenSlidingWindowDeclRef();
+ss  ;\n}\n;
+}
+else
+{
+ss  tmpi=vSubArguments[i]-GenSlidingWindowDeclRef();
+ss ;\n;
+}
+#else
+ss  tmpi=vSubArguments[i]-GenSlidingWindowDeclRef();
+ss ;\n;
+
+#endif
 }
-ssif(vSubArguments[0]-GenSlidingWindowDeclRef()==0.0)\n\t;
-ss\treturn (vSubArguments[2]-GenSlidingWindowDeclRef();
-ss+tFv)/;
-

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

2013-11-01 Thread Ray
 sc/source/core/opencl/op_financial.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 57a0008380254104656d31924243c92cec9cb79d
Author: I-Jui (Ray) Sung r...@multicorewareinc.com
Date:   Fri Nov 1 13:04:04 2013 -0500

GPU Calc: fixed a compiler warning

Change-Id: Ia468731911f4b492b85ede63a9646fe28ca63cd8

diff --git a/sc/source/core/opencl/op_financial.cxx 
b/sc/source/core/opencl/op_financial.cxx
index ff167e0..f2ae100 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -1963,11 +1963,11 @@ void OpPMT::GenSlidingWindowFunction(std::stringstream 
ss,
 ss  int gid0 = get_global_id(0);\n;
 ssdouble tmp0,tmp1,tmp2;\n;
 ssdouble tmp3=0,tmp4=0;\n;
-unsigned i = vSubArguments.size();
+size_t i = vSubArguments.size();
 size_t nItems = 0;
 ss \n;
 //while (i--  1)
-for (size_t i = 0; i  vSubArguments.size(); i++)
+for (i = 0; i  vSubArguments.size(); i++)
 {
 FormulaToken *pCur = vSubArguments[i]-GetFormulaToken();
 assert(pCur);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Bug 60698] kill pointless one-file library ...

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=60698

--- Comment #11 from Michael Meeks michael.me...@collabora.com ---
I imagine the idea is to save memory, but on any modern machine I suspect the
shlib overhead, and the linking cost of that makes that not worthwhile. Of
course - that is -assuming- that running 'ldd' on each of those shows that they
have the same shared library dependencies.

Clearly it needs a lot of testing - I -hope- we have at least one (trivial)
test image per file-format in git, and a unit test  for loading it - if not,
that is something we should add here before re-factoring that I think.

Anyhow - thanks for poking at this ! :-)

-- 
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: 2 commits - external/libetonyek

2013-11-01 Thread David Tardon
 external/libetonyek/0001-impl.-XML-format-detection.patch |   65 ++
 external/libetonyek/README|2 
 external/libetonyek/UnpackedTarball_libetonyek.mk |1 
 3 files changed, 67 insertions(+), 1 deletion(-)

New commits:
commit 638c2aa959f5911a81368c2a164ddb7cfd189660
Author: David Tardon dtar...@redhat.com
Date:   Fri Nov 1 18:11:40 2013 +0100

drop, remove and delete redundant words

Change-Id: I1d8fd6aa28e685bed4a1a0f2e4ccd888ba109e34

diff --git a/external/libetonyek/README b/external/libetonyek/README
index 2bd3ee6..1db5831 100644
--- a/external/libetonyek/README
+++ b/external/libetonyek/README
@@ -1 +1 @@
-Library for Library for import of Apple Keynote presentations.
+Library for import of Apple Keynote presentations.
commit 2a677e831528c6e9ddd5f926217faa4737ef86a3
Author: David Tardon dtar...@redhat.com
Date:   Fri Nov 1 19:25:02 2013 +0100

fix keynote format detection

Change-Id: Iadc1fe4efe891ef33f85086cfe0b811ebeb6e767

diff --git a/external/libetonyek/0001-impl.-XML-format-detection.patch 
b/external/libetonyek/0001-impl.-XML-format-detection.patch
new file mode 100644
index 000..c4e1904
--- /dev/null
+++ b/external/libetonyek/0001-impl.-XML-format-detection.patch
@@ -0,0 +1,65 @@
+From 28a3b93cc8b0050582c54722df5ac372530ff0a4 Mon Sep 17 00:00:00 2001
+From: David Tardon dtar...@redhat.com
+Date: Fri, 1 Nov 2013 18:29:40 +0100
+Subject: [PATCH] impl. XML format detection
+
+---
+ src/lib/KEYDocument.cpp | 31 ---
+ 1 file changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/KEYDocument.cpp b/src/lib/KEYDocument.cpp
+index 8ca33ad..a1a5477 100644
+--- a/src/lib/KEYDocument.cpp
 b/src/lib/KEYDocument.cpp
+@@ -13,10 +13,12 @@
+ #include libetonyek/KEYDocument.h
+ 
+ #include libetonyek_utils.h
++#include libetonyek_xml.h
+ #include KEY1Defaults.h
+ #include KEY1Parser.h
+ #include KEY2Defaults.h
+ #include KEY2Parser.h
++#include KEY2Token.h
+ #include KEYContentCollector.h
+ #include KEYDefaults.h
+ #include KEYDictionary.h
+@@ -60,9 +62,32 @@ enum Source
+ 
+ Version detectVersionFromInput(const WPXInputStreamPtr_t input)
+ {
+-  // TODO: do a real detection
+-  (void) input;
+-  return VERSION_KEYNOTE_5;
++  if (input-atEOS())
++return VERSION_UNKNOWN;
++
++  const KEY2Tokenizer tokenizer;
++  KEYXMLReader reader(input.get(), tokenizer);
++
++  if ((KEY2Token::NS_URI_KEY | KEY2Token::presentation) == getId(reader))
++  {
++const std::string version = readOnlyAttribute(reader, KEY2Token::version, 
KEY2Token::NS_URI_KEY);
++
++switch (tokenizer(version.c_str()))
++{
++case KEY2Token::VERSION_STR_2 :
++  return VERSION_KEYNOTE_2;
++case KEY2Token::VERSION_STR_3 :
++  return VERSION_KEYNOTE_3;
++case KEY2Token::VERSION_STR_4 :
++  return VERSION_KEYNOTE_4;
++case KEY2Token::VERSION_STR_5 :
++  return VERSION_KEYNOTE_5;
++}
++  }
++
++  // TODO: test for v.1 and v.6
++
++  return VERSION_UNKNOWN;
+ }
+ 
+ Version detectVersion(const WPXInputStreamPtr_t input, Source source)
+-- 
+1.8.3.1
+
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk 
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 1a6b32d..52eee68 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/0001-fix-windows-build.patch \
external/libetonyek/libetonyek-doubledelete.patch.0 \
+   external/libetonyek/0001-impl.-XML-format-detection.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread László Németh
 filter/source/svg/svgwriter.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit ee925743e556aeba42f6acb56dcd18d658a4d001
Author: László Németh nem...@numbertext.org
Date:   Fri Nov 1 19:47:56 2013 +0100

fdo#71136 fix SVG export (double stroke-width)

Change-Id: Iae5521e34951559351103a9defce30dc50d823c8

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index bed5b5c..3cb1ee7 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -2801,14 +2801,6 @@ void SVGActionWriter::ImplWriteActions( const 
GDIMetaFile rMtf,
 
 if( rPoly.GetSize() )
 {
-const LineInfo rLineInfo = pA-GetLineInfo();
-
-if(rLineInfo.GetWidth())
-{
-sal_Int32 nStrokeWidth = 
ImplMap(rLineInfo.GetWidth());
-mrExport.AddAttribute( XML_NAMESPACE_NONE, 
aXMLAttrStrokeWidth, OUString::number( nStrokeWidth ) );
-}
-
 mpContext-AddPaintAttr( mpVDev-GetLineColor(), 
Color( COL_TRANSPARENT ) );
 ImplAddLineAttr( pA-GetLineInfo() );
 ImplWritePolyPolygon( rPoly, sal_True );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread yiming ju
 sc/source/core/opencl/opinlinefun_finacial.cxx |  941 +
 1 file changed, 490 insertions(+), 451 deletions(-)

New commits:
commit 4ea4239719551ba06cc2ee9758a1d232a1c1e84e
Author: yiming ju yim...@multicorewareinc.com
Date:   Fri Nov 1 17:48:31 2013 +0800

GPU Calc: refactor string formatting in some GPU inline functions

Change-Id: I4ceb86ca84854a4e14c0720d6216d4c658a97859
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx 
b/sc/source/core/opencl/opinlinefun_finacial.cxx
index 05e6a5f..27a1625 100644
--- a/sc/source/core/opencl/opinlinefun_finacial.cxx
+++ b/sc/source/core/opencl/opinlinefun_finacial.cxx
@@ -14,10 +14,10 @@ std::string approxEqual =
 bool approxEqual(double a, double b)\n
 {\n
  if (a == b)\n
-\t\treturn true;\n
-\tdouble x = a - b;\n
-\treturn (x  0.0 ? -x : x)  ((a  0.0 ? -a : a) * (1.0 / (16777216.0 *
-16777216.0)));\n
+return true;\n
+ double x = a - b;\n
+ return (x  0.0 ? -x : x)  ((a  0.0 ? -a : a) * (1.0 / (16777216.0 *
+16777216.0)));\n
 }\n;
 
 std::string nKorrValDecl =double constant nKorrVal[]
@@ -32,21 +32,22 @@ std::string RoundDecl = double  Round(double fValue);\n;
 std::string Round =
 double  Round(double fValue)\n
 {\n
-\tif (fValue == 0.0)\n
-\t\treturn fValue;\n
-\tdouble fFac = 0;\n
-\tint nExp;\n
-\tif (fValue  0.0)\n
-\t\tnExp = (floor(log10(fValue)));\n
-\telse\n
-\t\tnExp = 0;\n
-\tint nIndex = 15 - nExp;\n
-\tif (nIndex  15)\n
-\t\tnIndex = 15;\n
-\telse if (nIndex = 1)\n
-\t\tnIndex = 0;\n
-\tfValue = floor(fValue + 0.5 + nKorrVal[nIndex]);\n
-\treturn fValue;\n
+if ( fValue == 0.0  )\n
+return fValue;\n
+\n
+double fFac = 0;\n
+int nExp;\n
+if ( fValue  0.0 )\n
+nExp = ( floor( log10( fValue ) ) );\n
+else\n
+nExp = 0;\n
+int nIndex = 15 - nExp;\n
+if ( nIndex  15 )\n
+nIndex = 15;\n
+else if ( nIndex = 1 )\n
+nIndex = 0;\n
+fValue = floor( fValue + 0.5 + nKorrVal[nIndex] );\n
+return fValue;\n
 }\n;
 
 std::string GetRmzDecl =
@@ -55,27 +56,29 @@ std::string GetRmzDecl =
 std::string GetRmz=
 double GetRmz( double fZins, double fZzr, double fBw, double fZw, int nF )\n
 {\n
-\tdouble  fRmz;\n
-\tif( fZins == 0.0 )\n
-\t\tfRmz = ( fBw + fZw ) / fZzr;\n
-\telse\n
-\t\t{\n
-\t\t\tdouble  fTerm = pow( 1.0 + fZins, fZzr );\n
-\t\t\tif( nF  0 )\n
-  \t\t\t\tfRmz = ( fZw * fZins / ( fTerm - 1.0 ) + fBw
-   * fZins / ( 1.0 - 1.0 / fTerm ) ) / ( 1.0 + fZins );\n
-\t\t\telse\n
-\t\t\t\tfRmz = fZw * fZins / ( fTerm - 1.0 ) + fBw * fZins /
-( 1.0 - 1.0 / fTerm );\n
-\t\t}\n
-\treturn -fRmz;\n
-}\n\n;
+double  fRmz;\n
+if( fZins == 0.0 )\n
+fRmz = ( fBw + fZw ) / fZzr;\n
+else\n
+{\n
+double  fTerm = pow( 1.0 + fZins, fZzr );\n
+if( nF  0 )\n
+fRmz = ( fZw * fZins / ( fTerm - 1.0 ) + fBw * fZins / ( 1.0 - 1.
+0 / fTerm ) ) / ( 1.0 + fZins );\n
+else\n
+fRmz = fZw * fZins / ( fTerm - 1.0 ) + fBw * fZins /( 1.0 - 1.0 
+/ fTerm );\n
+}\n
+return -fRmz;\n
+}\n;
 
 std::string GetZwDecl =
-double GetZw( double fZins, double fZzr, double fRmz, double fBw, int nF 
);\n;
+double GetZw( double fZins, double fZzr, double fRmz,
+double fBw, int nF );\n;
 
 std::string GetZw =
-double GetZw( double fZins, double fZzr, double fRmz, double fBw, int nF )\n
+double GetZw( double fZins, double fZzr, double fRmz,
+double fBw, int nF )\n
 {\n
 double  fZw;\n
 if( fZins == 0.0 )\n
@@ -84,13 +87,13 @@ std::string GetZw =
 {\n
 double  fTerm = pow( 1.0 + fZins, fZzr );\n
 if( nF  0 )\n
-fZw = fBw * fTerm + fRmz * ( 1.0 + fZins ) *
-( fTerm - 1.0 ) / fZins;\n
+fZw = fBw * fTerm + fRmz * ( 1.0 + fZins ) *( fTerm - 1.0 ) 
+/ fZins;\n
 else\n
-fZw = fBw * fTerm + fRmz * ( fTerm - 1.0 ) / fZins;\n
+fZw = fBw * fTerm + fRmz * ( fTerm - 1.0 ) / fZins;\n
 }\n
 return -fZw;\n
-}\n\n;
+}\n;
 
 std::string IsLeapYearDecl =
 bool IsLeapYear( int n );\n;
@@ -98,7 +101,8 @@ std::string IsLeapYearDecl =
 std::string IsLeapYear =
 bool IsLeapYear( int n )\n
 {\n
-return ( (( ( n % 4 ) == 0 )  ( ( n % 100 ) != 0)) || ( ( n % 400 ) == 
0 ) );\n
+return ( (( ( n % 4 ) == 0 )  ( ( n % 100 ) != 0)) || ( ( n % 400 ) == 
+0 ) );\n
 }\n;
 
 std::string DaysInMonthDecl=
@@ -107,8 +111,8 @@ std::string DaysInMonthDecl=
 std::string DaysInMonth =
 int DaysInMonth( int nMonth, int nYear )\n
 {\n
-int aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,\n
-31, 31, 30, 31, 30, 31 };\n
+int 

[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter-4' - sc/source

2013-11-01 Thread yiming ju
 sc/source/core/opencl/opinlinefun_finacial.cxx |  941 +
 1 file changed, 490 insertions(+), 451 deletions(-)

New commits:
commit 63798515b249dabd4af0ca4fd913536398f739ff
Author: yiming ju yim...@multicorewareinc.com
Date:   Fri Nov 1 17:48:31 2013 +0800

GPU Calc: refactor string formatting in some GPU inline functions

Change-Id: I4ceb86ca84854a4e14c0720d6216d4c658a97859
Signed-off-by: haochen haoc...@multicorewareinc.com
Signed-off-by: I-Jui (Ray) Sung r...@multicorewareinc.com

diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx 
b/sc/source/core/opencl/opinlinefun_finacial.cxx
index 05e6a5f..27a1625 100644
--- a/sc/source/core/opencl/opinlinefun_finacial.cxx
+++ b/sc/source/core/opencl/opinlinefun_finacial.cxx
@@ -14,10 +14,10 @@ std::string approxEqual =
 bool approxEqual(double a, double b)\n
 {\n
  if (a == b)\n
-\t\treturn true;\n
-\tdouble x = a - b;\n
-\treturn (x  0.0 ? -x : x)  ((a  0.0 ? -a : a) * (1.0 / (16777216.0 *
-16777216.0)));\n
+return true;\n
+ double x = a - b;\n
+ return (x  0.0 ? -x : x)  ((a  0.0 ? -a : a) * (1.0 / (16777216.0 *
+16777216.0)));\n
 }\n;
 
 std::string nKorrValDecl =double constant nKorrVal[]
@@ -32,21 +32,22 @@ std::string RoundDecl = double  Round(double fValue);\n;
 std::string Round =
 double  Round(double fValue)\n
 {\n
-\tif (fValue == 0.0)\n
-\t\treturn fValue;\n
-\tdouble fFac = 0;\n
-\tint nExp;\n
-\tif (fValue  0.0)\n
-\t\tnExp = (floor(log10(fValue)));\n
-\telse\n
-\t\tnExp = 0;\n
-\tint nIndex = 15 - nExp;\n
-\tif (nIndex  15)\n
-\t\tnIndex = 15;\n
-\telse if (nIndex = 1)\n
-\t\tnIndex = 0;\n
-\tfValue = floor(fValue + 0.5 + nKorrVal[nIndex]);\n
-\treturn fValue;\n
+if ( fValue == 0.0  )\n
+return fValue;\n
+\n
+double fFac = 0;\n
+int nExp;\n
+if ( fValue  0.0 )\n
+nExp = ( floor( log10( fValue ) ) );\n
+else\n
+nExp = 0;\n
+int nIndex = 15 - nExp;\n
+if ( nIndex  15 )\n
+nIndex = 15;\n
+else if ( nIndex = 1 )\n
+nIndex = 0;\n
+fValue = floor( fValue + 0.5 + nKorrVal[nIndex] );\n
+return fValue;\n
 }\n;
 
 std::string GetRmzDecl =
@@ -55,27 +56,29 @@ std::string GetRmzDecl =
 std::string GetRmz=
 double GetRmz( double fZins, double fZzr, double fBw, double fZw, int nF )\n
 {\n
-\tdouble  fRmz;\n
-\tif( fZins == 0.0 )\n
-\t\tfRmz = ( fBw + fZw ) / fZzr;\n
-\telse\n
-\t\t{\n
-\t\t\tdouble  fTerm = pow( 1.0 + fZins, fZzr );\n
-\t\t\tif( nF  0 )\n
-  \t\t\t\tfRmz = ( fZw * fZins / ( fTerm - 1.0 ) + fBw
-   * fZins / ( 1.0 - 1.0 / fTerm ) ) / ( 1.0 + fZins );\n
-\t\t\telse\n
-\t\t\t\tfRmz = fZw * fZins / ( fTerm - 1.0 ) + fBw * fZins /
-( 1.0 - 1.0 / fTerm );\n
-\t\t}\n
-\treturn -fRmz;\n
-}\n\n;
+double  fRmz;\n
+if( fZins == 0.0 )\n
+fRmz = ( fBw + fZw ) / fZzr;\n
+else\n
+{\n
+double  fTerm = pow( 1.0 + fZins, fZzr );\n
+if( nF  0 )\n
+fRmz = ( fZw * fZins / ( fTerm - 1.0 ) + fBw * fZins / ( 1.0 - 1.
+0 / fTerm ) ) / ( 1.0 + fZins );\n
+else\n
+fRmz = fZw * fZins / ( fTerm - 1.0 ) + fBw * fZins /( 1.0 - 1.0 
+/ fTerm );\n
+}\n
+return -fRmz;\n
+}\n;
 
 std::string GetZwDecl =
-double GetZw( double fZins, double fZzr, double fRmz, double fBw, int nF 
);\n;
+double GetZw( double fZins, double fZzr, double fRmz,
+double fBw, int nF );\n;
 
 std::string GetZw =
-double GetZw( double fZins, double fZzr, double fRmz, double fBw, int nF )\n
+double GetZw( double fZins, double fZzr, double fRmz,
+double fBw, int nF )\n
 {\n
 double  fZw;\n
 if( fZins == 0.0 )\n
@@ -84,13 +87,13 @@ std::string GetZw =
 {\n
 double  fTerm = pow( 1.0 + fZins, fZzr );\n
 if( nF  0 )\n
-fZw = fBw * fTerm + fRmz * ( 1.0 + fZins ) *
-( fTerm - 1.0 ) / fZins;\n
+fZw = fBw * fTerm + fRmz * ( 1.0 + fZins ) *( fTerm - 1.0 ) 
+/ fZins;\n
 else\n
-fZw = fBw * fTerm + fRmz * ( fTerm - 1.0 ) / fZins;\n
+fZw = fBw * fTerm + fRmz * ( fTerm - 1.0 ) / fZins;\n
 }\n
 return -fZw;\n
-}\n\n;
+}\n;
 
 std::string IsLeapYearDecl =
 bool IsLeapYear( int n );\n;
@@ -98,7 +101,8 @@ std::string IsLeapYearDecl =
 std::string IsLeapYear =
 bool IsLeapYear( int n )\n
 {\n
-return ( (( ( n % 4 ) == 0 )  ( ( n % 100 ) != 0)) || ( ( n % 400 ) == 
0 ) );\n
+return ( (( ( n % 4 ) == 0 )  ( ( n % 100 ) != 0)) || ( ( n % 400 ) == 
+0 ) );\n
 }\n;
 
 std::string DaysInMonthDecl=
@@ -107,8 +111,8 @@ std::string DaysInMonthDecl=
 std::string DaysInMonth =
 int DaysInMonth( int nMonth, int nYear )\n
 {\n
-int aDaysInMonth[12] = { 31, 28, 31, 30, 31, 30,\n
-31, 31, 30, 31, 30, 31 };\n
+int 

[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/qa

2013-11-01 Thread Kohei Yoshida
 sc/qa/unit/ucalc.hxx |2 +
 sc/qa/unit/ucalc_formula.cxx |   54 +++
 2 files changed, 56 insertions(+)

New commits:
commit fe04dbc12b9c02a8b7ac6040290712086c023382
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Nov 1 15:16:40 2013 -0400

Add test for multiple operations.  Part of it fails currently.

Change-Id: I90e3bbaae41fac51711b8502fbeb6ee2ebf19082

diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 5689435..b9c1d42 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -93,6 +93,7 @@ public:
 void testFormulaRefUpdateSheets();
 void testFormulaRefUpdateMove();
 void testFormulaRefUpdateNamedExpression();
+void testMultipleOperations();
 void testFuncCOLUMN();
 void testFuncROW();
 void testFuncSUM();
@@ -300,6 +301,7 @@ public:
 CPPUNIT_TEST(testFormulaRefUpdateSheets);
 CPPUNIT_TEST(testFormulaRefUpdateMove);
 CPPUNIT_TEST(testFormulaRefUpdateNamedExpression);
+CPPUNIT_TEST(testMultipleOperations);
 CPPUNIT_TEST(testFuncCOLUMN);
 CPPUNIT_TEST(testFuncROW);
 CPPUNIT_TEST(testFuncSUM);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 361c015..0e54fb0 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -21,6 +21,7 @@
 #include scmod.hxx
 #include docsh.hxx
 #include docfunc.hxx
+#include paramisc.hxx
 
 #include formula/vectortoken.hxx
 
@@ -1274,6 +1275,7 @@ void Test::testFormulaRefUpdateNamedExpression()
 m_pDoc-SetValue(ScAddress(3,9,1), 10);
 CPPUNIT_ASSERT_EQUAL(33.0, m_pDoc-GetValue(ScAddress(2,7,1)));
 
+// Delete the inserted sheet, which will shift the 'Formula' sheet to the 
left.
 m_pDoc-DeleteTab(0);
 
 aName = OUString();
@@ -1307,6 +1309,58 @@ void Test::testFormulaRefUpdateNamedExpression()
 m_pDoc-DeleteTab(0);
 }
 
+void Test::testMultipleOperations()
+{
+m_pDoc-InsertTab(0, MultiOp);
+
+sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
+
+// Insert the reference formula at top row.
+m_pDoc-SetValue(ScAddress(0,0,0), 1);
+m_pDoc-SetString(ScAddress(1,0,0), =A1*10);
+CPPUNIT_ASSERT_EQUAL(10.0, m_pDoc-GetValue(ScAddress(1,0,0)));
+
+// Insert variable inputs in A3:A5.
+m_pDoc-SetValue(ScAddress(0,2,0), 2);
+m_pDoc-SetValue(ScAddress(0,3,0), 3);
+m_pDoc-SetValue(ScAddress(0,4,0), 4);
+
+// Set multiple operations range.
+ScTabOpParam aParam;
+aParam.aRefFormulaCell = ScRefAddress(1,0,0,false,false,false);
+aParam.aRefFormulaEnd = aParam.aRefFormulaCell;
+aParam.aRefColCell = ScRefAddress(0,0,0,false,false,false);
+ScMarkData aMark;
+aMark.SetMarkArea(ScRange(0,2,0,1,4,0)); // Select A3:B5.
+m_pDoc-InsertTableOp(aParam, 0, 2, 1, 4, aMark);
+CPPUNIT_ASSERT_EQUAL(20.0, m_pDoc-GetValue(1,2,0));
+CPPUNIT_ASSERT_EQUAL(30.0, m_pDoc-GetValue(1,3,0));
+CPPUNIT_ASSERT_EQUAL(40.0, m_pDoc-GetValue(1,4,0));
+
+// Clear A3:B5.
+clearRange(m_pDoc, ScRange(0,2,0,1,4,0));
+
+// This time, use indirect reference formula cell.
+m_pDoc-SetString(ScAddress(2,0,0), =B1); // C1 simply references B1.
+CPPUNIT_ASSERT_EQUAL(10.0, m_pDoc-GetValue(ScAddress(2,0,0)));
+
+// Insert variable inputs in A3:A5.
+m_pDoc-SetValue(ScAddress(0,2,0), 3);
+m_pDoc-SetValue(ScAddress(0,3,0), 4);
+m_pDoc-SetValue(ScAddress(0,4,0), 5);
+
+// Set multiple operations range again, but this time, we'll use C1 as the 
reference formula.
+aParam.aRefFormulaCell.Set(2,0,0,false,false,false);
+aParam.aRefFormulaEnd = aParam.aRefFormulaCell;
+m_pDoc-InsertTableOp(aParam, 0, 2, 1, 4, aMark);
+#if 0 // TODO: Make this pass.
+CPPUNIT_ASSERT_EQUAL(30.0, m_pDoc-GetValue(1,2,0));
+CPPUNIT_ASSERT_EQUAL(40.0, m_pDoc-GetValue(1,3,0));
+CPPUNIT_ASSERT_EQUAL(50.0, m_pDoc-GetValue(1,4,0));
+#endif
+m_pDoc-DeleteTab(0);
+}
+
 void Test::testFuncCOLUMN()
 {
 m_pDoc-InsertTab(0, Formula);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: external/libetonyek

2013-11-01 Thread David Tardon
 external/libetonyek/0001-impl.-XML-format-detection.patch |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 46bcd543406a144c221a8055d3efeab94c08c6fc
Author: David Tardon dtar...@redhat.com
Date:   Fri Nov 1 20:20:21 2013 +0100

fix build with clang

Change-Id: I3fd7cfdf78dc221cbaa651ff351bc4ca76952d55

diff --git a/external/libetonyek/0001-impl.-XML-format-detection.patch 
b/external/libetonyek/0001-impl.-XML-format-detection.patch
index c4e1904..4ab7822 100644
--- a/external/libetonyek/0001-impl.-XML-format-detection.patch
+++ b/external/libetonyek/0001-impl.-XML-format-detection.patch
@@ -34,7 +34,7 @@ index 8ca33ad..a1a5477 100644
 +  if (input-atEOS())
 +return VERSION_UNKNOWN;
 +
-+  const KEY2Tokenizer tokenizer;
++  const KEY2Tokenizer tokenizer = KEY2Tokenizer();
 +  KEYXMLReader reader(input.get(), tokenizer);
 +
 +  if ((KEY2Token::NS_URI_KEY | KEY2Token::presentation) == getId(reader))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread László Németh
 filter/source/svg/svgwriter.cxx |   44 
 1 file changed, 44 insertions(+)

New commits:
commit a2b59a51274ccf29ce1bd77a9330c6e3136fc590
Author: László Németh nem...@numbertext.org
Date:   Fri Nov 1 20:41:51 2013 +0100

fdo#71137 fix linecap and linejoint in SVG export

Change-Id: I52ee0ec79ebcd5a32f0c328440ce46e0452b121e

diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 3cb1ee7..22b8c61 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -1861,7 +1861,51 @@ void SVGActionWriter::ImplAddLineAttr( const LineInfo 
rAttrs,
 sal_Int32 nStrokeWidth = bApplyMapping ? ImplMap( rAttrs.GetWidth() ) 
: rAttrs.GetWidth();
 mrExport.AddAttribute( XML_NAMESPACE_NONE, aXMLAttrStrokeWidth,
OUString::number( nStrokeWidth ) );
+// support for LineJoint
+switch(rAttrs.GetLineJoin())
+{
+default: // B2DLINEJOIN_NONE, B2DLINEJOIN_MIDDLE
+case basegfx::B2DLINEJOIN_MITER:
+{
+mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, 
miter);
+break;
+}
+case basegfx::B2DLINEJOIN_BEVEL:
+{
+mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, 
bevel);
+break;
+}
+case basegfx::B2DLINEJOIN_ROUND:
+{
+mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinejoin, 
round);
+break;
+}
+}
+
+// support for LineCap
+switch(rAttrs.GetLineCap())
+{
+default: /* com::sun::star::drawing::LineCap_BUTT */
+{
+// butt is Svg default, so no need to write until the exporter 
might write styles.
+// If this happens, activate here
+// mrExport.AddAttribute(XML_NAMESPACE_NONE, 
aXMLAttrStrokeLinecap, butt);
+break;
+}
+case com::sun::star::drawing::LineCap_ROUND:
+{
+mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, 
round);
+break;
+}
+case com::sun::star::drawing::LineCap_SQUARE:
+{
+mrExport.AddAttribute(XML_NAMESPACE_NONE, aXMLAttrStrokeLinecap, 
square);
+break;
+}
 }
+
+}
+
 }
 
 void SVGActionWriter::ImplWritePolyPolygon( const PolyPolygon rPolyPoly, 
sal_Bool bLineOnly,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-11-01 Thread Miklos Vajna
 sw/qa/extras/rtfexport/rtfexport.cxx |  243 +--
 1 file changed, 69 insertions(+), 174 deletions(-)

New commits:
commit 325cee9a6021eea3277999b66a1443bfceaf409f
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Nov 1 20:49:00 2013 +0100

Make CppunitTest_sw_rtfexport use DECLARE_SW_ROUNDTRIP_TEST()

Change-Id: I50babe172d3c9a46256ac3dc95a3b7591cd3c777

diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index 1951ddb..72beefc 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -6,6 +6,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include swmodeltestbase.hxx
+
+#if !defined(MACOSX)  !defined(WNT)
+
 #include com/sun/star/awt/Gradient.hpp
 #include com/sun/star/document/XDocumentPropertiesSupplier.hpp
 #include com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp
@@ -20,143 +24,34 @@
 #include com/sun/star/text/RelOrientation.hpp
 
 #include vcl/svapp.hxx
-#include swmodeltestbase.hxx
 
 class Test : public SwModelTestBase
 {
 public:
-void testZoom();
-void testFdo38176();
-void testFdo49683();
-void testFdo44174();
-void testFdo50087();
-void testFdo50831();
-void testFdo48335();
-void testFdo38244();
-void testMathAccents();
-void testMathEqarray();
-void testMathD();
-void testMathEscaping();
-void testMathLim();
-void testMathMatrix();
-void testMathBox();
-void testMathMso2007();
-void testMathNary();
-void testMathLimupp();
-void testMathStrikeh();
-void testMathPlaceholders();
-void testMathRad();
-void testMathSepchr();
-void testMathSubscripts();
-void testMathVerticalstacks();
-void testMathRuns();
-void testFdo53113();
-void testFdo55939();
-void testTextFrames();
-void testFdo53604();
-void testFdo52286();
-void testFdo61507();
-void testFdo30983();
-void testPlaceholder();
-void testMnor();
-void testI120928();
-void testBookmark();
-void testHyperlink();
-void testTextFrameBorders();
-void testTextframeGradient();
-void testRecordChanges();
-void testTextframeTable();
-void testFdo66682();
-void testParaShadow();
-void testCharacterBorder();
-void testFdo66743();
-
-CPPUNIT_TEST_SUITE(Test);
-#if !defined(MACOSX)  !defined(WNT)
-CPPUNIT_TEST(run);
-#endif
-CPPUNIT_TEST_SUITE_END();
+Test() : SwModelTestBase(/sw/qa/extras/rtfexport/data/, Rich Text 
Format) {}
+
+bool mustTestImportOf(const char* filename) const {
+// Don't test the first import of these, for some reason those tests 
fail
+const char* aBlacklist[] = {
+math-eqarray.rtf,
+math-escaping.rtf,
+math-lim.rtf,
+math-mso2007.rtf,
+math-nary.rtf,
+math-rad.rtf,
+math-vertical-stacks.rtf,
+math-runs.rtf,
+};
+std::vectorconst char* vBlacklist(aBlacklist, aBlacklist + 
SAL_N_ELEMENTS(aBlacklist));
 
-private:
-void run();
-};
-
-void Test::run()
-{
-MethodEntryTest aMethods[] = {
-{zoom.rtf, Test::testZoom},
-{fdo38176.rtf, Test::testFdo38176},
-{fdo49683.rtf, Test::testFdo49683},
-{fdo44174.rtf, Test::testFdo44174},
-{fdo50087.rtf, Test::testFdo50087},
-{fdo50831.rtf, Test::testFdo50831},
-{fdo48335.odt, Test::testFdo48335},
-{fdo38244.rtf, Test::testFdo38244},
-{math-accents.rtf, Test::testMathAccents},
-{math-eqarray.rtf, Test::testMathEqarray},
-{math-d.rtf, Test::testMathD},
-{math-escaping.rtf, Test::testMathEscaping},
-{math-lim.rtf, Test::testMathLim},
-{math-matrix.rtf, Test::testMathMatrix},
-{math-mbox.rtf, Test::testMathBox},
-{math-mso2007.rtf, Test::testMathMso2007},
-{math-nary.rtf, Test::testMathNary},
-{math-limupp.rtf, Test::testMathLimupp},
-{math-strikeh.rtf, Test::testMathStrikeh},
-{math-placeholders.rtf, Test::testMathPlaceholders},
-{math-rad.rtf, Test::testMathRad},
-{math-sepchr.rtf, Test::testMathSepchr},
-{math-subscripts.rtf, Test::testMathSubscripts},
-{math-vertical-stacks.rtf, Test::testMathVerticalstacks},
-{math-runs.rtf, Test::testMathRuns},
-{fdo53113.odt, Test::testFdo53113},
-{fdo55939.odt, Test::testFdo55939},
-{textframes.odt, Test::testTextFrames},
-{fdo53604.odt, Test::testFdo53604},
-{fdo52286.odt, Test::testFdo52286},
-{fdo61507.rtf, Test::testFdo61507},
-{fdo30983.rtf, Test::testFdo30983},
-{placeholder.odt, Test::testPlaceholder},
-{mnor.rtf, Test::testMnor},
-{i120928.rtf, Test::testI120928},
-{bookmark.rtf, Test::testBookmark},
-{hyperlink.rtf, Test::testHyperlink},
-{textframe-borders.rtf, 

Re: Compiling LibreOffice 4.1.2.3 on Solaris

2013-11-01 Thread Eric Bautsch

Yes, the command is pvs:
http://docs.oracle.com/cd/E19253-01/816-5165/pvs-1/

And the output suggests that the versions are OK:

   bautsche@cressida $ pvs solver/unxsogi.pro/bin/idlc
   libm.so.2 (SUNW_1.1);
   libgcc_s.so.1 (GCC_3.0);
   libc.so.1 (SUNWprivate_1.1, SUNW_1.1, SUNW_0.9, SUNW_0.7, SYSVABI_1.3);
   libuno_sal.so.3 (LIBO_UDK_4.1, UDK_3.6, LIBO_UDK_4.0, PRIVATE_1.1, UDK_3
   _0_0);
   bautsche@cressida $ pvs solver/unxsogi.pro/lib/libuno_sal.so.3
   libgcc_s.so.1 (GCC_3.0);
   libsocket.so.1 (SUNW_1.1, SUNW_0.7);
   libnsl.so.1 (SUNW_0.7);
   libm.so.2 (SUNW_1.1);
   libpthread.so.1 (SUNW_1.1, SUNW_1.2, SUNW_0.9);
   libuno_sal.so.3;
   UDK_3_0_0;
   UDK_3.1;
   UDK_3.2;
   UDK_3.3;
   UDK_3.4;
   UDK_3.5;
   UDK_3.6;
   UDK_3.7;
   UDK_3.8;
   UDK_3.9;
   UDK_3.10;
   UDK_3.11;
   LIBO_UDK_3.5;
   LIBO_UDK_3.6;
   LIBO_UDK_4.0;
   LIBO_UDK_4.1;
   PRIVATE_1.0;
   PRIVATE_1.1;
   PRIVATE_1.2;
   PRIVATE_textenc.1;
   PRIVATE_file.1;
   GLIBCXX_3.4;
   bautsche@cressida $



On 01/11/2013 15:22, Stephan Bergmann wrote:

On 11/01/2013 03:48 PM, Eric Bautsch wrote:

Output from LD_DEBUG=all ldd -r solver/unxsogi.pro/bin/idlc log 21
attached.


Unfortunately doesn't give a clue why the loader refuses to pick the symobls 
from libuno_sal.so.3.


The last idea I have is that there's something wrong with the symbol versions.


02205: file=libuno_sal.so.3; needed by solver/unxsogi.pro/bin/idlc
02205:
02205: find object=libuno_sal.so.3; searching
02205: search 
path=$ORIGIN/../../ure-link/lib:/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib 
(RUNPATH/RPATH from file solver/unxsogi.pro/bin/idlc)
02205: trying 
path=/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/bin/../../ure-link/lib/libuno_sal.so.3
02205: trying 
path=/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libuno_sal.so.3
libuno_sal.so.3 = 
/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libuno_sal.so.3
02205: 
file=/export/home/bautsche/libre-office/libreoffice-4.1.2.3/solver/unxsogi.pro/lib/libuno_sal.so.3 
[ ELF ]; generating link map

02205: addr: 0xfe4e4000 size: 0x4e38c
02205: lmid: BASE lmco: 0x10
02205:
02205: version needed processing: file=solver/unxsogi.pro/bin/idlc
02205: file version
02205: libuno_sal.so.3 LIBO_UDK_4.1
02205: libuno_sal.so.3 UDK_3.6
02205: libuno_sal.so.3 LIBO_UDK_4.0
02205: libuno_sal.so.3 PRIVATE_1.1
02205: libuno_sal.so.3 UDK_3_0_0


indicates that idlc does expect to see versioned symbols from libuno_sal.so.3, 
but I forgot what the Solaris command is to see what versions the symbols 
exported/required by an object should have (psv? pvs? something like that), 
and whether there's an LD_DEBUG argument in addition to all on Solaris to 
make it output information about symbol resolution version mismatch.


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



--
 
  

 /  .   Eric A. Bautsch
/--   __   _____
   / //   /  /
  (_/(___(__/   email: eric.baut...@pobox.com



smime.p7s
Description: S/MIME Cryptographic Signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2013-11-01 Thread Miklos Vajna
 writerfilter/source/doctok/DffImpl.cxx   |   36 +++
 writerfilter/source/doctok/resources.xmi |9 --
 writerfilter/source/doctok/resources.xsl |   36 ---
 writerfilter/source/doctok/resourcesimpl.xsl |   17 +---
 4 files changed, 6 insertions(+), 92 deletions(-)

New commits:
commit d8fbc8432da8db0b9ad364b917637a2432c58deb
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Fri Nov 1 21:12:12 2013 +0100

writerfilter: remove unused WW8FOPTE class in doctok

Change-Id: I041983293690b5d5e090ba88df509c35cc8f6dc7

diff --git a/writerfilter/source/doctok/DffImpl.cxx 
b/writerfilter/source/doctok/DffImpl.cxx
index 546680f..86189e3 100644
--- a/writerfilter/source/doctok/DffImpl.cxx
+++ b/writerfilter/source/doctok/DffImpl.cxx
@@ -267,37 +267,14 @@ sal_uInt32 DffOPT::get_property_count()
 }
 
 writerfilter::ReferenceProperties::Pointer_t
-DffOPT::get_property(sal_uInt32 nPos)
+DffOPT::get_property(sal_uInt32 /*nPos*/)
 {
-WW8FOPTE * pTmp = new WW8FOPTE(this, 0x8 + nPos * WW8FOPTE::getSize());
-pTmp-setIndex(nPos);
-
-return writerfilter::ReferenceProperties::Pointer_t(pTmp);
+return writerfilter::ReferenceProperties::Pointer_t();
 }
 
-sal_uInt32 DffOPT::get_extraoffset(sal_uInt32 pos)
+sal_uInt32 DffOPT::get_extraoffset(sal_uInt32 /*pos*/)
 {
-sal_uInt32 nResult;
-sal_uInt32 nCount = get_property_count();
-
-if (pos  nCount)
-{
-nResult = 0x8 + nCount * WW8FOPTE::getSize();
-
-for (sal_uInt32 n = 0; n  pos; ++n)
-{
-WW8FOPTE aFOPTE(this, 0x8 + n * WW8FOPTE::getSize());
-
-if (aFOPTE.get_fComplex())
-{
-sal_uInt32 nValue = aFOPTE.get_op();
-nResult += nValue;
-}
-}
-}
-else
-nResult = getCount();
-
+sal_uInt32 nResult = 0;
 return nResult;
 }
 
@@ -337,11 +314,6 @@ DffBSE::get_blip()
 return pResult;
 }
 
-// WW8FOPTE
-void WW8FOPTE::resolveNoAuto(Properties )
-{
-}
-
 // DffFSP
 
 OUString DffFSP::get_shptypename()
diff --git a/writerfilter/source/doctok/resources.xmi 
b/writerfilter/source/doctok/resources.xmi
index 40a694e..21f0060 100644
--- a/writerfilter/source/doctok/resources.xmi
+++ b/writerfilter/source/doctok/resources.xmi
@@ -26732,15 +26732,6 @@
 !--Class Rectangle--
 !--Class FOPTE--
 UML:Class xmi.id=FOPTE name=FOPTE
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=ww8resource/
-  /UML:ModelElement.stereotype
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=withindex/
-  /UML:ModelElement.stereotype
-  UML:ModelElement.stereotype
-UML:Stereotype xmi.idref=resolvenoauto/
-  /UML:ModelElement.stereotype
   UML:ModelElement.taggedValue
 UML:TaggedValue
   UML:TaggedValue.dataValue6/UML:TaggedValue.dataValue
diff --git a/writerfilter/source/doctok/resources.xsl 
b/writerfilter/source/doctok/resources.xsl
index 11eaeb8..3c649fb 100644
--- a/writerfilter/source/doctok/resources.xsl
+++ b/writerfilter/source/doctok/resources.xsl
@@ -75,9 +75,6 @@ OUString getDffOptName(sal_uInt32 nPid);
   xsl:when test='.//UML:Stereotype[@xmi.idref = dffrecord]'
 xsl:apply-templates select=. mode=dffrecord/
   /xsl:when
-  xsl:when test='.//UML:Stereotype[@xmi.idref = dffopt]'
-xsl:apply-templates select=. mode=dffopt/
-  /xsl:when
 /xsl:choose
   /xsl:template
 
@@ -793,39 +790,6 @@ public:
 /xsl:template
 
 
-xsl:template match=UML:Class mode=dffopt
-!--
-  xsl:variable name=classname
-  xsl:textDffOpt/xsl:textxsl:value-of select=@name/
-  /xsl:variable
-  xsl:text
-/** 
-Automaticallay generated class:
-  /xsl:text
-  xsl:value-of select=$classname/
-  xsl:text#xa;
-*/#xa;
-class /xsl:text
-xsl:value-of select=$classname/
-xsl:text : public WW8FOPTE
-{
-/xsl:text
-xsl:value-of select=$classname/
-xsl:text(WW8FOPTE amp; rOpt) : WW8FOPTE(rOpt) {}
-
-virtual string getName() const
-{
-   return /xsl:text
-   xsl:value-of select=@name/
-   xsl:text;
- }#xa;/xsl:text
-
- xsl:text
-};
-/xsl:text 
---
-/xsl:template
-
 xsl:template name=parenttype
   xsl:param name='type'/
   xsl:for-each 
select='/XMI/XMI.content/UML:Model/UML:Namespace.ownedElement/UML:Generalization[UML:Generalization.child/UML:Class/@xmi.idref=$type]'
diff --git a/writerfilter/source/doctok/resourcesimpl.xsl 
b/writerfilter/source/doctok/resourcesimpl.xsl
index f54f3be..873f989 100644
--- a/writerfilter/source/doctok/resourcesimpl.xsl
+++ b/writerfilter/source/doctok/resourcesimpl.xsl
@@ -443,27 +443,14 @@ OUString getDffOptName(sal_uInt32)
 
 xsl:template name=ww8foptegetvalue
   xsl:text
-WW8Value::Pointer_t WW8FOPTE::get_value()
-{
-WW8Value::Pointer_t pResult;
-return pResult;
-}/xsl:text
+/xsl:text
 /xsl:template
 
 xsl:template 

[Bug 70553] Update .desktop files to use freedesktop actions

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=70553

Jean-Baptiste Faure jbf.fa...@sud-ouest.org changed:

   What|Removed |Added

   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=69344

-- 
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 60270] LibreOffice 4.1 most annoying bugs

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=60270

Bug 60270 depends on bug 70815, which changed state.

Bug 70815 Summary: EDITING: cell is not updated when referenced cell becomes 
empty due to sort
https://bugs.freedesktop.org/show_bug.cgi?id=70815

   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: Changes to 'feature/ia2'

2013-11-01 Thread David Ostrovsky
New branch 'feature/ia2' available with the following commits:
commit 642035c591e342e966bf5303be347c9605a3e429
Author: David Ostrovsky da...@ostrovsky.org
Date:   Fri Nov 1 23:16:54 2013 +0100

UAA to IA2 bridge

Change-Id: Id911cea8052e35072aba4bf7c6bc95aeaddbd0b3

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/inc sc/qa sc/source

2013-11-01 Thread Kohei Yoshida
 sc/inc/column.hxx   |2 +-
 sc/qa/unit/ucalc_formula.cxx|3 +--
 sc/source/core/data/column.cxx  |   14 +++---
 sc/source/core/data/column3.cxx |8 
 4 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 017f5344cac2c34bc0c189a3d44d2712a758c33c
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Nov 1 18:36:42 2013 -0400

Fix multiple operations with formula cell with indirect dependency.

Now the unit test passes.  Good.

Change-Id: I23fa8355805c192f43db0199f3628f2bf457a645

diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx
index e1b4ec3..8e27b8a 100644
--- a/sc/inc/column.hxx
+++ b/sc/inc/column.hxx
@@ -491,7 +491,7 @@ public:
 bool HasBroadcaster() const;
 
 void Broadcast( SCROW nRow );
-void BroadcastCells( const std::vectorSCROW rRows );
+void BroadcastCells( const std::vectorSCROW rRows, sal_uLong nHint );
 
 // cell notes
 ScPostIt* GetCellNote( SCROW nRow );
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 0e54fb0..cca7155 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -1353,11 +1353,10 @@ void Test::testMultipleOperations()
 aParam.aRefFormulaCell.Set(2,0,0,false,false,false);
 aParam.aRefFormulaEnd = aParam.aRefFormulaCell;
 m_pDoc-InsertTableOp(aParam, 0, 2, 1, 4, aMark);
-#if 0 // TODO: Make this pass.
 CPPUNIT_ASSERT_EQUAL(30.0, m_pDoc-GetValue(1,2,0));
 CPPUNIT_ASSERT_EQUAL(40.0, m_pDoc-GetValue(1,3,0));
 CPPUNIT_ASSERT_EQUAL(50.0, m_pDoc-GetValue(1,4,0));
-#endif
+
 m_pDoc-DeleteTab(0);
 }
 
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 63433c5..9a5fac3 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -890,7 +890,7 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
 SwapCellTextAttrs(nRow1, nRow2);
 SwapCellNotes(nRow1, nRow2);
 CellStorageModified();
-BroadcastCells(aRows);
+BroadcastCells(aRows, SC_HINT_DATACHANGED);
 return;
 }
 
@@ -938,7 +938,7 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
 SwapCellTextAttrs(nRow1, nRow2);
 SwapCellNotes(nRow1, nRow2);
 CellStorageModified();
-BroadcastCells(aRows);
+BroadcastCells(aRows, SC_HINT_DATACHANGED);
 return;
 }
 
@@ -983,7 +983,7 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
 SwapCellTextAttrs(nRow1, nRow2);
 SwapCellNotes(nRow1, nRow2);
 CellStorageModified();
-BroadcastCells(aRows);
+BroadcastCells(aRows, SC_HINT_DATACHANGED);
 return;
 }
 
@@ -1117,7 +1117,7 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2)
 SwapCellTextAttrs(nRow1, nRow2);
 SwapCellNotes(nRow1, nRow2);
 CellStorageModified();
-BroadcastCells(aRows);
+BroadcastCells(aRows, SC_HINT_DATACHANGED);
 }
 
 namespace {
@@ -2760,7 +2760,7 @@ public:
 {
 std::vectorSCROW aRows;
 maValueRanges.getRows(aRows);
-mrColumn.BroadcastCells(aRows);
+mrColumn.BroadcastCells(aRows, SC_HINT_DATACHANGED);
 }
 };
 
@@ -2792,7 +2792,7 @@ public:
 {
 std::vectorSCROW aRows;
 maValueRanges.getRows(aRows);
-mrColumn.BroadcastCells(aRows);
+mrColumn.BroadcastCells(aRows, SC_HINT_TABLEOPDIRTY);
 }
 };
 
@@ -3171,7 +3171,7 @@ void ScColumn::BroadcastRecalcOnRefMove()
 sc::AutoCalcSwitch aSwitch(*pDocument, false);
 RecalcOnRefMoveCollector aFunc;
 sc::ProcessFormula(maCells, aFunc);
-BroadcastCells(aFunc.getDirtyRows());
+BroadcastCells(aFunc.getDirtyRows(), SC_HINT_DATACHANGED);
 }
 
 void ScColumn::CalcAll()
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 3b9475a..1909e81 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -74,13 +74,13 @@ void ScColumn::Broadcast( SCROW nRow )
 pDocument-Broadcast(aHint);
 }
 
-void ScColumn::BroadcastCells( const std::vectorSCROW rRows )
+void ScColumn::BroadcastCells( const std::vectorSCROW rRows, sal_uLong 
nHint )
 {
 if (rRows.empty())
 return;
 
 // Broadcast the changes.
-ScHint aHint(SC_HINT_DATACHANGED, ScAddress(nCol, 0, nTab));
+ScHint aHint(nHint, ScAddress(nCol, 0, nTab));
 std::vectorSCROW::const_iterator itRow = rRows.begin(), itRowEnd = 
rRows.end();
 for (; itRow != itRowEnd; ++itRow)
 {
@@ -285,7 +285,7 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize )
 sc::SharedFormulaUtil::joinFormulaCellAbove(aPos);
 
 // Single cell broadcasts on deleted cells.
-BroadcastCells(aDeleteRowsFunc.getNonEmptyRows());
+BroadcastCells(aDeleteRowsFunc.getNonEmptyRows(), SC_HINT_DATACHANGED);
 
 // Shift the text attribute array too (before the broadcast).
 maCellTextAttrs.erase(nStartRow, nEndRow);
@@ -626,7 +626,7 @@ void ScColumn::DeleteArea(SCROW nStartRow, 

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

2013-11-01 Thread Jan Holesovsky
 starmath/source/mathtype.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 86b79ea1f6afb709f2de8141810a61e4162e3125
Author: Jan Holesovsky ke...@collabora.com
Date:   Sat Nov 2 00:19:29 2013 +0100

starmath: Check for text length.

Fixes fdo32667-1.doc.

Change-Id: Ibe7a9ca83b65e7b13c6b315f1b771f50f0b6fc7a

diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 58053e4..d8c93ef 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -606,9 +606,9 @@ int MathType::Parse(SotStorage *pStor)
 
 static void lcl_PrependDummyTerm(OUString rRet, sal_Int32 rTextStart)
 {
-if ((rRet[rTextStart] == '=') 
-((rTextStart == 0) ||
-(rRet[ rTextStart-1 ] == '{'))
+if ((rTextStart  rRet.getLength()) 
+(rRet[rTextStart] == '=') 
+((rTextStart == 0) || (rRet[ rTextStart-1 ] == '{'))
)
 {
 rRet = rRet.replaceAt(rTextStart,0, {});
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - 3 commits - sc/source

2013-11-01 Thread Kohei Yoshida
 sc/source/core/data/documentimport.cxx |   57 +
 sc/source/filter/orcus/interface.cxx   |2 -
 sc/source/filter/xml/xmlcelli.cxx  |3 -
 3 files changed, 37 insertions(+), 25 deletions(-)

New commits:
commit 7db26c533be55fbe2c9ffe8246939ae8aadbad31
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Nov 1 20:23:18 2013 -0400

Use position hints for broadcasters when activating formula cells.

No reason not to do this since we are bulk-registering formula cells.

Change-Id: Ie0356c62a3c4698f5560272cb0c104f84cacde56

diff --git a/sc/source/core/data/documentimport.cxx 
b/sc/source/core/data/documentimport.cxx
index f52eb38..3b33f46 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -19,16 +19,22 @@
 #include stringutil.hxx
 #include compiler.hxx
 #include paramisc.hxx
+#include listenercontext.hxx
 
 #include svl/sharedstringpool.hxx
 
 struct ScDocumentImportImpl
 {
 ScDocument mrDoc;
+sc::StartListeningContext maListenCxt;
 sc::ColumnBlockPositionSet maBlockPosSet;
 sal_uInt16 mnDefaultScriptNumeric;
 
-ScDocumentImportImpl(ScDocument rDoc) : mrDoc(rDoc), maBlockPosSet(rDoc), 
mnDefaultScriptNumeric(SC_SCRIPTTYPE_UNKNOWN) {}
+ScDocumentImportImpl(ScDocument rDoc) :
+mrDoc(rDoc),
+maListenCxt(rDoc),
+maBlockPosSet(rDoc),
+mnDefaultScriptNumeric(SC_SCRIPTTYPE_UNKNOWN) {}
 };
 
 ScDocumentImport::ScDocumentImport(ScDocument rDoc) : mpImpl(new 
ScDocumentImportImpl(rDoc)) {}
@@ -398,13 +404,15 @@ namespace {
 class CellStoreInitializer
 {
 ScDocument mrDoc;
+sc::StartListeningContext mrListenCxt;
 sc::CellTextAttrStoreType maAttrs;
 sc::CellTextAttrStoreType::iterator miPos;
 sal_uInt16 mnScriptNumeric;
 
 public:
-CellStoreInitializer(ScDocument rDoc, sal_uInt16 nScriptNumeric) :
+CellStoreInitializer(ScDocument rDoc, sc::StartListeningContext rCxt, 
sal_uInt16 nScriptNumeric) :
 mrDoc(rDoc),
+mrListenCxt(rCxt),
 maAttrs(MAXROWCOUNT),
 miPos(maAttrs.begin()),
 mnScriptNumeric(nScriptNumeric) {}
@@ -429,7 +437,7 @@ public:
 for (; it != itEnd; ++it)
 {
 ScFormulaCell rFC = **it;
-rFC.StartListeningTo(mrDoc);
+rFC.StartListeningTo(mrListenCxt);
 }
 }
 }
@@ -444,7 +452,8 @@ public:
 
 void ScDocumentImport::finalize()
 {
-// Populate the text width and script type arrays in all columns.
+// Populate the text width and script type arrays in all columns. Also
+// activate all formula cells.
 ScDocument::TableContainer::iterator itTab = mpImpl-mrDoc.maTabs.begin(), 
itTabEnd = mpImpl-mrDoc.maTabs.end();
 for (; itTab != itTabEnd; ++itTab)
 {
@@ -461,7 +470,7 @@ void ScDocumentImport::finalize()
 
 void ScDocumentImport::initColumn(ScColumn rCol)
 {
-CellStoreInitializer aFunc(mpImpl-mrDoc, mpImpl-mnDefaultScriptNumeric);
+CellStoreInitializer aFunc(mpImpl-mrDoc, mpImpl-maListenCxt, 
mpImpl-mnDefaultScriptNumeric);
 std::for_each(rCol.maCells.begin(), rCol.maCells.end(), aFunc);
 aFunc.swap(rCol.maCellTextAttrs);
 rCol.RegroupFormulaCells();
commit 4b040c2f0923808e81dba576c942db744d500078
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Nov 1 20:14:12 2013 -0400

No point using the pimpl pattern here.

The whole class is already hidden in the source file.

Change-Id: Ib6157ae275217a95586735f74beee1700041a679

diff --git a/sc/source/core/data/documentimport.cxx 
b/sc/source/core/data/documentimport.cxx
index c2b951a..f52eb38 100644
--- a/sc/source/core/data/documentimport.cxx
+++ b/sc/source/core/data/documentimport.cxx
@@ -397,23 +397,17 @@ namespace {
 
 class CellStoreInitializer
 {
-struct Impl
-{
-sc::CellTextAttrStoreType maAttrs;
-sc::CellTextAttrStoreType::iterator miPos;
-sal_uInt16 mnScriptNumeric;
-
-Impl(const sal_uInt32 nMaxRowCount, const sal_uInt16 nScriptNumeric)
-: maAttrs(nMaxRowCount), miPos(maAttrs.begin()), 
mnScriptNumeric(nScriptNumeric)
-{}
-};
-
 ScDocument mrDoc;
-boost::shared_ptrImpl mpImpl;
+sc::CellTextAttrStoreType maAttrs;
+sc::CellTextAttrStoreType::iterator miPos;
+sal_uInt16 mnScriptNumeric;
 
 public:
 CellStoreInitializer(ScDocument rDoc, sal_uInt16 nScriptNumeric) :
-mrDoc(rDoc), mpImpl(new Impl(MAXROWCOUNT, nScriptNumeric)) {}
+mrDoc(rDoc),
+maAttrs(MAXROWCOUNT),
+miPos(maAttrs.begin()),
+mnScriptNumeric(nScriptNumeric) {}
 
 void operator() (const sc::CellStoreType::value_type node)
 {
@@ -423,9 +417,9 @@ public:
 // Fill with default values for non-empty cell segments.
 sc::CellTextAttr aDefault;
 if (node.type == sc::element_type_numeric)
-aDefault.mnScriptType = mpImpl-mnScriptNumeric;
+   

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

2013-11-01 Thread Caolán McNamara
 sc/source/core/tool/interpr2.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 16aedfcc7a3aeb3ff30210d57f837583aa12b667
Author: Caolán McNamara caol...@redhat.com
Date:   Fri Nov 1 13:10:39 2013 +

Resolves: fdo#71106 editing dde function crashes

Change-Id: Id2f4bffb7de7201ddeb8f75daaa2723cc42c59b0
(cherry picked from commit 3b27470860cfa377dfc0cb940bba204d827434ad)
Reviewed-on: https://gerrit.libreoffice.org/6520
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us

diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index aec003e..7cc59de 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -2124,7 +2124,7 @@ void ScInterpreter::ScDde()
 //! Dde-Links (zusaetzlich) effizienter am Dokument speichern !
 //  ScDdeLink* pLink = pDok-GetDdeLink( aAppl, aTopic, aItem );
 
-bool bWasError = ( pMyFormulaCell-GetRawError() != 0 );
+bool bWasError = ( pMyFormulaCell  pMyFormulaCell-GetRawError() != 
0 );
 
 if (!pLink)
 {
@@ -2140,19 +2140,23 @@ void ScInterpreter::ScDde()
 //! asynchron auswerten ???
 pLink-TryUpdate(); //  TryUpdate ruft Update nicht mehrfach 
auf
 
-// StartListening erst nach dem Update, sonst circular reference
-pMyFormulaCell-StartListening( *pLink );
+if (pMyFormulaCell)
+{
+// StartListening erst nach dem Update, sonst circular 
reference
+pMyFormulaCell-StartListening( *pLink );
+}
 }
 else
 {
-pMyFormulaCell-StartListening( *pLink );
+if (pMyFormulaCell)
+pMyFormulaCell-StartListening( *pLink );
 }
 
 //  Wenn aus dem Reschedule beim Ausfuehren des Links ein Fehler
 //  (z.B. zirkulaere Referenz) entstanden ist, der vorher nicht da war,
 //  das Fehler-Flag zuruecksetzen:
 
-if ( pMyFormulaCell-GetRawError()  !bWasError )
+if ( pMyFormulaCell  pMyFormulaCell-GetRawError()  !bWasError )
 pMyFormulaCell-SetErrCode(0);
 
 //  Wert abfragen
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'private/kohei/xlsx-import-speedup' - sc/qa

2013-11-01 Thread Kohei Yoshida
 dev/null|binary
 sc/qa/unit/data/xls/data-table-mortgage.xls |binary
 sc/qa/unit/subsequent_filters-test.cxx  |2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ba753fc4b4744c33b030188e0f18bc5fbb54a3a3
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Fri Nov 1 21:14:35 2013 -0400

Renamed test file.

Change-Id: I912778f2eedb162f2a04c0a7bc8a5220ea0fca2c

diff --git a/sc/qa/unit/data/xls/data-table.xls 
b/sc/qa/unit/data/xls/data-table-mortgage.xls
similarity index 100%
rename from sc/qa/unit/data/xls/data-table.xls
rename to sc/qa/unit/data/xls/data-table-mortgage.xls
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 853187c..4083993 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -1072,7 +1072,7 @@ void ScFiltersTest::testDataValidityODS()
 
 void ScFiltersTest::testDataTableXLS()
 {
-ScDocShellRef xDocSh = loadDoc(data-table., XLS);
+ScDocShellRef xDocSh = loadDoc(data-table-mortgage., XLS);
 ScFormulaOptions aOptions;
 aOptions.SetFormulaSepArg(,);
 aOptions.SetFormulaSepArrayCol(,);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [Libreoffice-qa] Why does the Tools - Options menu get that wide?

2013-11-01 Thread Jean-Baptiste Faure
Hi Thomas,

Le 31/10/2013 18:22, Thomas Hackert a écrit :
 Hello @ll,
[...]
 Nouveau display driver
 Resolution: 1024x768/24

No problem for me on Ubuntu 13.10 with the same resolution.
A problem with the Nouveau driver ? Did you try the Nvidia driver ?

Best regards.
JBF

-- 
Seuls des formats ouverts peuvent assurer la pérennité de vos documents.
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Why does the Tools - Options menu get that wide?

2013-11-01 Thread Thomas Hackert
Good morning Jean-Baptiste, *,
On Freitag, 1. November 2013 08:35 Jean-Baptiste Faure wrote:
 Le 31/10/2013 18:22, Thomas Hackert a écrit :
 Nouveau display driver
 Resolution: 1024x768/24
 
 No problem for me on Ubuntu 13.10 with the same resolution.
 A problem with the Nouveau driver ? Did you try the Nvidia driver
 ?

no, I have not used the NVidia driver since eons (I had a couple of 
problems with them, so I switched to Nouveau ... ;) Given that you 
mean nvidia-glx, nvidia-kernel and the like ... ;) ). Maybe I will 
try it again later, when I have the time.
Thank you for your answer
Thomas.

-- 
NP: The Forced Oscillations – Acids (Tbilisi-89 Mix)

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] Why does the Tools - Options menu get that wide?

2013-11-01 Thread Thomas Hackert
Good morning Jochen, *,
On Donnerstag, 31. Oktober 2013 22:05 Jochen Schiffers wrote:
 Is it only on my system?
 No problem using Germanophone UI 4.1.2
 OS: Windows 7
 Resolution: 1920x1080

a much larger
 Resolution: 1024x768/24

than mine ... ;) Which graphics card/chip are you using btw?
Thank you for your answer
Thomas.
TOFU removed

-- 
  I'd give my right arm to be ambidextrous.

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


Re: [Libreoffice-qa] quick question on function in Master

2013-11-01 Thread Thomas Hackert
Good morning Cor, *,
On Donnerstag, 31. Oktober 2013 21:02 Cor Nouws wrote:
 People running a daily/master build, could the pls look what is
 the result when choosing:
 
File  Templates  Save As Template
 and
File  Templates  New Document From Template

what exactly are you experiencing? The only differences I see so far 
is, that – when I choose the first one – I get a preview of the 
presentation template while I did see them, when I choose the second 
one. The other one is, that this button above is labelled Save in 
the first dialog, but Repository in the second one. And in the 
first dialog you can only choose to save between the different 
template folders, while in the second one you can also choose 
between Documents, Spreadsheets, Presentations and Drawings 
... ;) All tested in Writer that far from LO Version: 
4.2.0.0.alpha0+ Build ID: aeb29afa11b7be87153f048044a2d4af9a87b50c
TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:master, Time: 
2013-10-29_20:58:33 with installed en-US lang- as well as helppack 
under Debian Testing AMD64.


 Background: for me there is some strange behaviour, but for
 someone else it works fine...

And what exactly? Could you give us a more detailed description, 
please? Is this strange behaviour related to the UI or if you try 
to save/apply a template?

 (BTW: the latter entry should be renamed).

How would you name it then?
Have a nice day
Thomas.

-- 
NP: Botany Bay – Feel

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/

Re: [Libreoffice-qa] QA Call moving to Mondays at 19:30 UTC

2013-11-01 Thread Tommy
On Fri, 01 Nov 2013 05:49:52 +0100, Robinson Tryon  
bishop.robin...@gmail.com wrote:



Hi all,

A big thanks to all of the QA folks who have listed their hours of
availability on the Doodle or who have emailed us directly. We
received a lot of useful input and are optimistic that our new time
will allow more QA Team members to join the call!




see you on monday, it will be my first QA call.

___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


Re: [Libreoffice-qa] PENDING ITEM: Updates to the BSA

2013-11-01 Thread Robinson Tryon
On Fri, Nov 1, 2013 at 5:13 PM, Rob Snelders libreoff...@ertai.nl wrote:
 Hi All,

 Looking at the action-items open on [1]. I found this one:

 PENDING ITEM: Updates to the BSA
 ACTION: Remove EOL versions from the BSA and implement 'please update'
 message (Rob)

 But that has already been implemented back in July by Robinson[2]. So that
 action-item can be closed

It's still possible to file bugs against EOL versions using the BSA.
For example:
https://www.libreoffice.org/bugzilla/show_bug.cgi?id=71150

I think we can remove all of the versions from
unsupported-versions.txt and blacklist all of the EOL releases by
adding them to in version-blacklist.txt. My thinking would be to add a
single version Older to the drop-down list and use that as the
trigger for when the please update message appears.

Or perhaps we can just tweak the code so that whenever anything in
unsupported-versions.txt is selected, we not only show the please
update message, but we also hide the text-entry boxes and submit
button?

--R
___
List Name: Libreoffice-qa mailing list
Mail address: Libreoffice-qa@lists.freedesktop.org
Change settings: http://lists.freedesktop.org/mailman/listinfo/libreoffice-qa
Problems? http://www.libreoffice.org/get-help/mailing-lists/how-to-unsubscribe/
Posting guidelines + more: http://wiki.documentfoundation.org/Netiquette
List archive: http://lists.freedesktop.org/archives/libreoffice-qa/


[Libreoffice-bugs] [Bug 70564] Other: Hovering over Organize macros opens the Macro selector window

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=70564

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

Summary|Other: Hovering over|Other: Hovering over
   |Organize macros opens the |Organize macros opens the
   |Macro selector window |Macro selector window
   |when macro recording is |
   |disabled|

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs


[Libreoffice-bugs] [Bug 70564] Other: Hovering over Organize macros opens the Macro selector window when macro recording is disabled

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=70564

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---
 Ever confirmed|0   |1

--- Comment #2 from chtfn stephane.guil...@gmail.com ---
Actually, I just came across this bug again, but this time with macro recording
enabled...

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs


[Libreoffice-bugs] [Bug 61185] Calc Charts: Non-contiguous category ranges

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=61185

--- Comment #4 from chtfn stephane.guil...@gmail.com ---
I can confirm this is still present in 4.1.2.3

Sad to see it is such a long-standing regression!

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs


[Libreoffice-bugs] [Bug 68821] Writer freezes up when trying to save document under Windows 8

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=68821

--- Comment #4 from kees...@gmail.com ---
I too have the same problem since I work with Winodws8. Unchanged documents
open en close fine. After editing the file saves fine, but Writer then freezes
for about a minute and in the title bar it says 'writer is not responding'.
After that it takes longer to open the file too.

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs


[Libreoffice-bugs] [Bug 62540] Add styles for editing charts

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=62540

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #2 from chtfn stephane.guil...@gmail.com ---
I am marking this one as a duplicate of a younger bug because it is more
active.

*** This bug has been marked as a duplicate of bug 62925 ***

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs


[Libreoffice-bugs] [Bug 62925] FORMATTING: enhancement: please add chart styles to the styles of Calc

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=62925

--- Comment #12 from chtfn stephane.guil...@gmail.com ---
*** Bug 62540 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs


[Libreoffice-bugs] [Bug 62860] provide easy way to change common / default FORMATTING STYLES for data series

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=62860

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=62925

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs


[Libreoffice-bugs] [Bug 62925] FORMATTING: enhancement: please add chart styles to the styles of Calc

2013-11-01 Thread bugzilla-daemon
https://bugs.freedesktop.org/show_bug.cgi?id=62925

chtfn stephane.guil...@gmail.com changed:

   What|Removed |Added

   See Also||https://bugs.freedesktop.or
   ||g/show_bug.cgi?id=62860

-- 
You are receiving this mail because:
You are the assignee for the bug.
___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs


  1   2   3   >