[Libreoffice-commits] core.git: Branch 'feature/android-viewer-lok' - 7 commits - android/Bootstrap android/experimental desktop/source include/sal sal/osl sal/rtl

[Jan Holesovsky]

 android/Bootstrap/Makefile.shared  
   |   95 +
 android/experimental/DocumentLoader/Makefile   
   |   97 -
 android/experimental/LOAndroid3/AndroidManifest.xml
   |1 
 android/experimental/LOAndroid3/Makefile   
   |   94 -
 
android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 |4 
 android/experimental/LibreOffice4Android/Makefile  
   |   94 -
 android/experimental/desktop/Makefile  
   |   99 --
 desktop/source/lib/init.cxx
   |2 
 include/sal/log-areas.dox  
   |1 
 sal/osl/unx/file.cxx   
   |2 
 sal/rtl/bootstrap.cxx  
   |5 
 11 files changed, 109 insertions(+), 385 deletions(-)

New commits:
commit 02e5efdd87ab6460625084b83525ff7735962f5e
Author: Jan Holesovsky 
Date:   Mon Jun 30 08:10:39 2014 +0200

It is useful to know what macros are we expanding, and to what.

Change-Id: If7704edc5baa9759abc680b8d2040b9cdfe92317

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 1627ad2..c5d1196 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -20,6 +20,7 @@ certain functionality.
 
 @section SAL
 
+@li @c sal.bootstrap - SAL bootstrap
 @li @c sal.debug - SAL debugging functionality
 @li @c sal.file
 @li @c sal.osl - SAL OSL library
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx
index c93aa0c..cf5b9ca 100644
--- a/sal/rtl/bootstrap.cxx
+++ b/sal/rtl/bootstrap.cxx
@@ -895,6 +895,7 @@ rtl::OUString expandMacros(
 Bootstrap_Impl const * file, rtl::OUString const & text, LookupMode mode,
 ExpandRequestLink const * requestStack)
 {
+SAL_INFO("sal.bootstrap", "expandMacros called with: " << text);
 rtl::OUStringBuffer buf;
 for (sal_Int32 i = 0; i < text.getLength();) {
 bool escaped;
@@ -1020,7 +1021,9 @@ rtl::OUString expandMacros(
 }
 }
 }
-return buf.makeStringAndClear();
+OUString result(buf.makeStringAndClear());
+SAL_INFO("sal.bootstrap", "expandMacros result: " << result);
+return result;
 }
 
 }
commit fcc97709ea217b44cc43d8186ecabdc03e963980
Author: Jan Holesovsky 
Date:   Mon Jun 30 07:56:12 2014 +0200

android: Enable debugging messages as the first thing we do.

Additionally log what we are trying to open - very useful for debugging
bootstrap problems ;-)

Change-Id: I942b144d97a57cbcb709b2d67029bfa09b339be2

diff --git 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
index 3d30dcc..a4ae79c 100644
--- 
a/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
+++ 
b/android/experimental/LOAndroid3/src/java/org/libreoffice/LibreOfficeMainActivity.java
@@ -74,9 +74,11 @@ public class LibreOfficeMainActivity extends Activity {
 super.onCreate(savedInstanceState);
 
 try {
-LibreOfficeKit.init(this);
+// enable debugging messages as the first thing
 LibreOfficeKit.putenv("SAL_LOG=+WARN+INFO-INFO.legacy.osl");
 
+LibreOfficeKit.init(this);
+
 setContentView(R.layout.activity_main);
 
 Log.w(LOGTAG, "zerdatime " + SystemClock.uptimeMillis() + " - 
onCreate");
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index a7eaac1..092f0ffe 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -827,6 +827,8 @@ openFilePath( const char *cpFilePath, oslFileHandle* 
pHandle, sal_uInt32 uFlags,
 oslFileError eRet;
 
 #ifdef ANDROID
+SAL_INFO("sal.file", "osl_openFile: " << cpFilePath);
+
 /* Opening a file from /assets read-only means
  * we should mmap it from the .apk file
  */
commit dcfe0787eb062a57134686cd47ee4cbd5c6ff46a
Author: Jan Holesovsky 
Date:   Mon Jun 30 07:49:44 2014 +0200

android: Correct location and name of sofficerc.

Without that, URE_BOOTSTRAP does not get set up, and we are unable to
bootstrap.

Change-Id: I7727e2a9dcbb958e006fadf6243e1ca343633f7e

diff --git a/android/Bootstrap/Makefile.shared 
b/android/Bootstrap/Makefile.shared
index e16de61..a337a80 100644
--- a/android/Bootstrap/Makefile.shared
+++ b/android/Bootstrap/Makefile.shared
@@ -137,19 +137,15 @@ copy-stuff:
mkdir -p assets/share/config
cp -R $(INSTDIR)/share/registry assets/share
cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config
-#
-# Set up rc, the "inifile". See BootstrapMap::ge

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

[Peter Senna Tschudin]

 editeng/source/rtf/svxrtf.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 0fef0d41f7e373d562c0689107183ab40e09d129
Author: Peter Senna Tschudin 
Date:   Sun Jun 29 22:52:35 2014 +0200

Drop unecessary continue

Change-Id: Ibd16b4328da70d6ae48669a9becdb4690c6ef4df
Reviewed-on: https://gerrit.libreoffice.org/9969
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 0746aa3..19ae8a8 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -1322,7 +1322,6 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& 
rParser )
 {
 pChildList->erase( pChildList->begin() + n );
 --n;
-continue;
 }
 }
 if( pChildList->empty() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Peter Senna Tschudin]

 sdext/source/pdfimport/tree/pdfiprocessor.cxx |1 -
 vcl/osx/DataFlavorMapping.cxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit f8018266ccff7ecceb26795aeb91a6ca560e8467
Author: Peter Senna Tschudin 
Date:   Sun Jun 29 22:52:08 2014 +0200

Remove double assignment

The semantic match that finds this problem is follows:
(http://coccinelle.lip6.fr/)

// 
@r@
expression i,f;
position p1,p2;
@@
(
(<+...i++...+>) = ...;
|
(<+...++i...+>) = ...;
|
(<+...i--...+>) = ...;
|
(<+...--i...+>) = ...;
|
i = <+...f(...)...+>;
|
i@p1 = ...;
(
i = <+...i...+>;
|
i = <+...f(...)...+>;
|
i@p2 = ...;
)
)

@@
expression i;
position r.p1,r.p2;
@@

* i@p1 = ...;
i@p2 = ...;
// 

Change-Id: Ifacb878d58486f2645560592484ce24b2bc0bd6f
Reviewed-on: https://gerrit.libreoffice.org/9968
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.cxx 
b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
index 3a670a6..37f4126 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.cxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.cxx
@@ -638,7 +638,6 @@ void PDFIProcessor::emit( XmlEmitter&   
rEmitter,
 aProps[ "xmlns:xsd"]  = "http://www.w3.org/2001/XMLSchema";;
 aProps[ "xmlns:xsi"]  = 
"http://www.w3.org/2001/XMLSchema-instance";;
 aProps[ "office:version" ]= "1.0";
-aProps[ "office:version" ]= "1.0";
 
 aContext.rEmitter.beginTag( "office:document", aProps );
 
diff --git a/vcl/osx/DataFlavorMapping.cxx b/vcl/osx/DataFlavorMapping.cxx
index 95584bb..33bd19b 100644
--- a/vcl/osx/DataFlavorMapping.cxx
+++ b/vcl/osx/DataFlavorMapping.cxx
@@ -508,7 +508,6 @@ const NSString* DataFlavorMapper::openOfficeToSystemFlavor( 
const DataFlavor& oO
 {
 const NSString* sysFlavor = NULL;
 rbInternal = false;
-rbInternal = false;
 
 for( size_t i = 0; i < SIZE_FLAVOR_MAP; ++i )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - ucb/source

[Mihai Varga]

 ucb/source/ucp/cmis/auth_provider.cxx |   35 ++
 ucb/source/ucp/cmis/auth_provider.hxx |   11 +
 ucb/source/ucp/cmis/cmis_repo_content.cxx |4 +++
 3 files changed, 50 insertions(+)

New commits:
commit b6909c3319b4200318cb178df21aeddb551b4159
Author: Mihai Varga 
Date:   Mon Jun 30 10:12:13 2014 +0300

AuthFallback request is sent correctly

diff --git a/ucb/source/ucp/cmis/auth_provider.cxx 
b/ucb/source/ucp/cmis/auth_provider.cxx
index bd00986..9a5d2e9 100644
--- a/ucb/source/ucp/cmis/auth_provider.cxx
+++ b/ucb/source/ucp/cmis/auth_provider.cxx
@@ -13,6 +13,7 @@
 #include 
 
 #include 
+#include 
 
 #include "auth_provider.hxx"
 
@@ -21,6 +22,8 @@ using namespace std;
 
 namespace cmis
 {
+com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment> 
+AuthProvider::sm_xEnv;
 bool AuthProvider::authenticationQuery( string& username, string& password 
)
 {
 if ( m_xEnv.is() )
@@ -36,6 +39,7 @@ namespace cmis
 STD_TO_OUSTR( username ),
 STD_TO_OUSTR( password ),
 OUString(), true, false );
+
 xIH->handle( xRequest.get() );
 
 rtl::Reference< ucbhelper::InteractionContinuation > xSelection
@@ -62,6 +66,37 @@ namespace cmis
 }
 return false;
 }
+
+char* AuthProvider::onedriveAuthCodeFallback( const char* url,
+const char* /*username*/,
+const char* /*password*/ )
+{
+OUString instructions = "Please open the following link in your 
browser and\n"
+"paste the code from the URL you have been redirected to\n"
+"in the box bellow. For example:\n"
+
"https://login.live.com/oauth20_desktop.srf?code=YOUR_CODE&lc=1033";;
+OUString url_oustr( url, strlen( url ), RTL_TEXTENCODING_UTF8 );
+const com::sun::star::uno::Reference< 
+com::sun::star::ucb::XCommandEnvironment> xEnv = getXEnv( );
+
+if ( xEnv.is() )
+{
+uno::Reference< task::XInteractionHandler > xIH
+= xEnv->getInteractionHandler();
+
+if ( xIH.is() )
+{
+rtl::Reference< ucbhelper::AuthenticationFallbackRequest > 
xRequest
+= new ucbhelper::AuthenticationFallbackRequest (
+instructions, url_oustr );
+xIH->handle( xRequest.get() );
+rtl::Reference< ucbhelper::InteractionContinuation > xSelection
+= xRequest->getSelection();
+}
+}
+
+return strdup( "" );
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx 
b/ucb/source/ucp/cmis/auth_provider.hxx
index f36d9a7..9fbf599 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -18,6 +18,7 @@ namespace cmis
 class AuthProvider : public libcmis::AuthProvider
 {
 const com::sun::star::uno::Reference< 
com::sun::star::ucb::XCommandEnvironment>& m_xEnv;
+static com::sun::star::uno::Reference< 
com::sun::star::ucb::XCommandEnvironment> sm_xEnv;
 OUString m_sUrl;
 OUString m_sBindingUrl;
 
@@ -29,6 +30,16 @@ namespace cmis
 m_xEnv( xEnv ), m_sUrl( sUrl ), m_sBindingUrl( sBindingUrl ) { 
}
 
 bool authenticationQuery( std::string& username, std::string& 
password ) SAL_OVERRIDE;
+
+static char* onedriveAuthCodeFallback( const char* url,
+const char* /*username*/,
+const char* /*password*/ );
+
+static void setXEnv( const com::sun::star::uno::Reference<
+com::sun::star::ucb::XCommandEnvironment>& xEnv ) { 
sm_xEnv = xEnv; }
+
+static com::sun::star::uno::Reference< 
+com::sun::star::ucb::XCommandEnvironment> getXEnv( ) { return 
sm_xEnv; }
 };
 }
 
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx 
b/ucb/source/ucp/cmis/cmis_repo_content.cxx
index 2516387..e364b43 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx
@@ -139,6 +139,7 @@ namespace cmis
 
 // Get the auth credentials
 AuthProvider authProvider( xEnv, 
m_xIdentifier->getContentIdentifier( ), m_aURL.getBindingUrl( ) );
+AuthProvider::setXEnv( xEnv );
 
 string rUsername = OUSTR_TO_STDSTR( m_aURL.getUsername( ) );
 string rPassword = OUSTR_TO_STDSTR( m_aURL.getPassword( ) );
@@ -159,10 +160,13 @@ namespace cmis
 ALFRESCO_CLOUD_SCOPE, ALFRESCO_CLOUD_REDIRECT_URI,
 ALFRESCO_CLOUD_CLIENT_ID, 
ALFRESCO_CLOUD_CLIENT_SECRET ) );
 if ( m_aURL.getBindingUrl( ) == ONEDRIVE_BASE_URL )
+{
+libcmis::SessionFactory::setOAuth2AuthCodeProvi

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

[Andrzej Hunt]

 sd/source/ui/dlg/RemoteDialogClientBox.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 679b1ed8655c3128e2f14a8d5cdc9be25c822bc0
Author: Andrzej Hunt 
Date:   Mon Jun 30 09:15:20 2014 +0200

More -WaE: nested template problems.

Change-Id: I896773bd37d855b83e9dfc260cae293a6f92100a

diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.cxx 
b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
index 3522910..4af291f 100644
--- a/sd/source/ui/dlg/RemoteDialogClientBox.cxx
+++ b/sd/source/ui/dlg/RemoteDialogClientBox.cxx
@@ -687,11 +687,11 @@ void ClientBox::populateEntries()
 #ifdef ENABLE_SDREMOTE
 RemoteServer::ensureDiscoverable();
 
-vector<::boost::shared_ptr> aClients( 
RemoteServer::getClients() );
+vector< ::boost::shared_ptr< ClientInfo > > aClients( 
RemoteServer::getClients() );
 
-const vector<::boost::shared_ptr>::const_iterator aEnd( 
aClients.end() );
+const vector< ::boost::shared_ptr >::const_iterator aEnd( 
aClients.end() );
 
-for ( vector<::boost::shared_ptr>::const_iterator aIt( 
aClients.begin() );
+for ( vector< ::boost::shared_ptr< ClientInfo > >::const_iterator aIt( 
aClients.begin() );
 aIt != aEnd; ++aIt )
 {
 addEntry( *aIt );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - editeng/source sd/qa

[Matúš Kukan]

 editeng/source/editeng/impedit3.cxx |4 ++--
 sd/qa/unit/data/xml/n593612_0.xml   |4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 70b3e3c175c3f69f3781b5cbb5e33952a5562821
Author: Matúš Kukan 
Date:   Mon Jun 23 11:37:47 2014 +0200

bnc#882631: Do not hide top of the first row when editing text in table 
cells.

This can happen when proportional line spacing is less than 100%
and "FontIndependentLineSpacing" is set, so just keep the height
of the very first line in case of IsFixedCellHeight() too.

Change-Id: Id231fc1f2373645e5420f877e8c2568ce8a1f099
(cherry picked from commit 9388c45c0263a0090f9cb4be9c42b93b5f7985d0)
Reviewed-on: https://gerrit.libreoffice.org/9891
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 99b851d..a3686f2 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1343,7 +1343,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, 
sal_uInt32 nStartPosY )
 }
 else if ( rLSItem.GetInterLineSpaceRule() == 
SVX_INTER_LINE_SPACE_PROP )
 {
-if ( nPara || IsFixedCellHeight() || pLine->GetStartPortion() 
) // Not the very first line
+if ( nPara || pLine->GetStartPortion() ) // Not the very first 
line
 {
 // There are documents with PropLineSpace 0, why?
 // (cmc: re above question :-) such documents can be seen 
by importing a .ppt
@@ -1673,7 +1673,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( 
ParaPortion* pParaPortion, sal_uIn
 else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP 
)
 {
 sal_Int32 nPara = GetParaPortions().GetPos( pParaPortion );
-if ( nPara || IsFixedCellHeight() || pTmpLine->GetStartPortion() ) 
// Not the very first line
+if ( nPara || pTmpLine->GetStartPortion() ) // Not the very first 
line
 {
 // There are documents with PropLineSpace 0, why?
 // (cmc: re above question :-) such documents can be seen by 
importing a .ppt
diff --git a/sd/qa/unit/data/xml/n593612_0.xml 
b/sd/qa/unit/data/xml/n593612_0.xml
index c4501c4..19c8a01 100644
--- a/sd/qa/unit/data/xml/n593612_0.xml
+++ b/sd/qa/unit/data/xml/n593612_0.xml
@@ -1,6 +1,6 @@
 
 
- 
+ 
   
   
   
@@ -10,7 +10,7 @@
   
   

-   
+   

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

Re: xmlsecurity build error

[Riccardo Magliocchetti]

Hi Marina,

Il 27/06/2014 16:23, Marina Latini ha scritto:

hi all,

is this a known build error? I updated the master branch today with git pull.
http://pastebin.com/4NzPNaUC


If it's a common issue it'll be fixed shortly, if not your config.log 
may be helpful.


riccardo

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

Re: Icons/themes selection broken on 4.3.0.1

[Rene Engelhard]

Hi,

On Fri, Jun 27, 2014 at 12:13:50PM +0200, Regina Henschel wrote:
> We received the same error description on the German
> ask.libreoffice. 
> http://ask.libreoffice.org/de/question/36123/icons-have-changed-after-update-cannot-be-changed-back/
> The question is in English, my answer in German. I think, the
> behavior is a bug, but I've got no version 4.3 to test it on
> Windows. Version 4.4 on Windows does not show that behavior.

Did you try to remove images_*.zip from your tree? Then it should exibit
the bug (and only start working again when you have images_tango.zip).

I bet you tried in 4.4 with just keeping all images_*? And you are
sure you got galaxy as icons and not tango? (Have a 4.4 build but didn't
try there yet..)

That upstream install/"packages" all keep them in one package/install
is one thing, some packages have them in various packages[1] so one doesn't
need to install all of them when you don't need them (especially for
hicrontrast, sifr). No idea whether/how OpenSUSE does that, but..,

> It > might be a problem on OpenSuse.

That is a too early conclusion when you even wer not able to test it
yourself in a senario where this problem actually exists..

At least Debian is also affected.

Regards,

Rene

[1]
https://packages.debian.org/search?suite=experimental&keywords=libreoffice-style
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3b/168ead25db16c12524054692512e5ba83b85e0

[Caolán McNamara]

 3b/168ead25db16c12524054692512e5ba83b85e0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4d80d933e48a97c6770ae52e1dea4272059fce8d
Author: Caolán McNamara 
Date:   Mon Jun 30 09:46:32 2014 +0100

Notes added by 'git notes add'

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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/source

[Kohei Yoshida]

 chart2/source/controller/dialogs/DataBrowser.cxx   |3 +--
 chart2/source/controller/main/ChartController_EditData.cxx |4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 388e66387bb6346f7cdc8b55ade39fd6a0bc2545
Author: Kohei Yoshida 
Date:   Fri Jun 27 11:31:06 2014 -0400

Flush modified data to the model when pressing OK in the data table dialog.

This dialog used to have no OK / Cancel buttons, and the data would get
flushed when the dialog got dismissed.  This behavior got lost during the
dialog conversion.

Also, SaveModified() does check whether or not the data table is modified.
No need to call IsModified() before calling SaveModified().

Change-Id: I5cea88cb52127cc5c7c1be67a5a592d87df92d0c
(cherry picked from commit 483a4b546c850e82a2d1d304238d4830ac6b441f)
Reviewed-on: https://gerrit.libreoffice.org/9940
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx 
b/chart2/source/controller/dialogs/DataBrowser.cxx
index 94174dd..bf4f089 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -1202,8 +1202,7 @@ bool DataBrowser::SaveModified()
 
 bool DataBrowser::EndEditing()
 {
-if( IsModified())
-SaveModified();
+SaveModified();
 
 // apply changes made to series headers
 ::std::for_each( m_aSeriesHeaders.begin(), m_aSeriesHeaders.end(), 
impl::applyChangesFunctor());
diff --git a/chart2/source/controller/main/ChartController_EditData.cxx 
b/chart2/source/controller/main/ChartController_EditData.cxx
index c87f167..726ba03 100644
--- a/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/chart2/source/controller/main/ChartController_EditData.cxx
@@ -57,8 +57,8 @@ void ChartController::executeDispatch_EditData()
 SCH_RESSTR( STR_ACTION_EDIT_CHART_DATA ),
 m_xUndoManager );
 DataEditor aDataEditorDialog( pParent, xChartDoc, m_xCC );
-// the dialog has no OK/Cancel
-aDataEditorDialog.Execute();
+if (aDataEditorDialog.Execute() == RET_OK)
+aDataEditorDialog.ApplyChangesToModel();
 aUndoGuard.commit();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 70998] Termchange: Graphic/Picture -> Image

[bugzilla-daemon]

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

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|target:4.2.0 EasyHack   |target:4.2.0 EasyHack
   |DifficultyBeginner  |DifficultyBeginner
   |TopicCleanup target:4.3.0   |TopicCleanup target:4.3.0
   ||target:4.4.0

--- Comment #21 from Commit Notification 
 ---
Stanislav Horacek committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=7fa690d1df4f79f129af28319381e1fd83e1b178

related fdo#70998 change names in Navigator to plural



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

[Stanislav Horacek]

 sc/source/ui/navipi/navipi.src |2 +-
 sw/source/ui/utlui/utlui.src   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7fa690d1df4f79f129af28319381e1fd83e1b178
Author: Stanislav Horacek 
Date:   Fri Jun 27 18:52:15 2014 +0200

related fdo#70998 change names in Navigator to plural

to be consistent with names of other items

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

diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index cbb59f4..7b68de7 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.src
@@ -281,7 +281,7 @@ String SCSTR_CONTENT_DBAREA
 
 String SCSTR_CONTENT_GRAPHIC
 {
-Text [ en-US ] = "Image" ;
+Text [ en-US ] = "Images" ;
 };
 
 String SCSTR_CONTENT_OLEOBJECT
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index f2ed93c..ee722c0 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -185,7 +185,7 @@ String STR_CONTENT_TYPE_FRAME
 };
 String STR_CONTENT_TYPE_GRAPHIC
 {
-Text [ en-US ] = "Image" ;
+Text [ en-US ] = "Images" ;
 };
 String STR_CONTENT_TYPE_OLE
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jeroen Nijhof]

 svl/source/filerec/filerec.cxx |  545 ++---
 1 file changed, 245 insertions(+), 300 deletions(-)

New commits:
commit 51902977075176b3dc550e33636f582b4a6932c0
Author: Jeroen Nijhof 
Date:   Sat Jun 28 17:39:35 2014 +0200

Translate German comments in filerec.cxx and doxygen-ify.

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

diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index f76aba5..739a466 100644
--- a/svl/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.cxx
@@ -21,9 +21,9 @@
 #include 
 
 
-/*  Die folgenden Makros extrahieren Teilbereiche aus einem sal_uInt32 Wert.
-Diese sal_uInt32-Werte werden anstelle der einzelnen Werte gestreamt,
-um Calls zu sparen.
+/*  The following macros extract parts from a sal_uInt32 value.
+These sal_uInt32 values are written out instead of the individual
+values to reduce the number of calls.
 */
 
 #define SFX_REC_PRE(n) ( ((n) & 0x00FF) )
@@ -36,9 +36,9 @@
 #define SFX_REC_CONTENT_OFS(n) ( ((n) & 0xFF00) >> 8 )
 
 
-/*  Die folgenden Makros setzen Teilbereiche zu einem sal_uInt32 Wert zusammen.
-Diese sal_uInt32-Werte werden anstelle der einzelnen Werte gestreamt,
-um Calls zu sparen.
+/*  The following macros combine parts to a sal_uInt32 value.
+This sal_uInt32 value is written instead of the individual values
+to reduce the number of calls.
 */
 
 static void lclWriteMiniHeader(SvStream *p, sal_uInt32 nPreTag, sal_uInt32 
nStartPos, sal_uInt32 nEndPos)
@@ -58,80 +58,57 @@ static void lclWriteHeader(SvStream *p, sal_uInt32 
nRecType, sal_uInt32 nContent
 ( sal_uInt32(nContentVer) | \
   sal_uInt32( nCurStartPos - n1StStartPos ) << 8 )
 
-
-sal_uInt32 SfxMiniRecordWriter::Close
-(
-bool bSeekToEndOfRec/*  true (default)
-Der Stream wird an das Ende des Records
-positioniert.
-
-false
-Der Stream wird an den Anfang des
-Contents (also hinter den Header)
-positioniert.
-*/
-)
-
-/*  [Beschreibung]
-
-Diese Methode schlie\st den Record. Dabei wird haupts"achlich der
-Header geschrieben.
-
-Wurde der Header bereits geschrieben, hat der Aufruf keine Wirkung.
-
-
-[R"uckgabewert]
-
-sal_uInt32  != 0
-Position im Stream, die direkt hinter dem Record liegt.
-'bSeekToEndOfRecord==sal_True'
-=> R"uckgabewert == aktuelle Stream-Position nach Aufruf
-
-== 0
-Der Header war bereits geschrieben worden.
-*/
-
+/** Close the record; write the header
+ *
+ * @param bSeekToEndOfRec
+ * if true (default) the stream is positioned at the end of the record;
+ * if false the stream at the start of the content (so after the header).
+ *
+ * This method closes the record. The main function is to write the header.
+ * If the header was written already this method is a no-op.
+ *
+ * @return sal_uInt32 != 0:  Position im the stream immediately after the 
record.
+ * If 'bSeekToEndOfRecord==sal_True' this will be equal to the current stream 
position.
+ * == 0: The header was already written.
+ */
+sal_uInt32 SfxMiniRecordWriter::Close(bool bSeekToEndOfRec)
 {
-// wurde der Header noch nicht geschrieben?
+// The header wasn't written yet?
 if ( !_bHeaderOk )
 {
-// Header an den Anfang des Records schreiben
+// Write header at the start of the record
 sal_uInt32 nEndPos = _pStream->Tell();
 _pStream->Seek( _nStartPos );
 lclWriteMiniHeader(_pStream, _nPreTag, _nStartPos, nEndPos );
 
-// je nachdem ans Ende des Records seeken oder hinter Header bleiben
+// seek to the end of the record or stay where we are
 if ( bSeekToEndOfRec )
 _pStream->Seek( nEndPos );
 
-// Header wurde JETZT geschrieben
+// the header has been written NOW
 _bHeaderOk = true;
 return nEndPos;
 }
 
-// Record war bereits geschlossen
+// Record was closed already
 return 0;
 }
 
-bool SfxMiniRecordReader::SetHeader_Impl( sal_uInt32 nHeader )
-
-/*  [Beschreibung]
-
-Interne Methode zum nachtr"aglichen Verarbeiten eines extern gelesenen
-Headers. Falls der Header eine End-Of-Records-Kennung darstellt,
-wird am Stream ein Errorcode gesetzt und sal_False zur"uckgeliefert. Im
-Fehlerfall wird der Stream jedoch nicht auf den Record-Anfang zur"uck-
-gesetzt.
+/**
+Internal method for belatedly processsing a header read externally.
+If the header corresponds to an End-Of-Record tag, a

[Libreoffice-commits] core.git: include/svl

[Jeroen Nijhof]

 include/svl/filerec.hxx |  467 
 1 file changed, 238 insertions(+), 229 deletions(-)

New commits:
commit b7558d19bbafb9f562c440bbee13388f8c4a3bfa
Author: Jeroen Nijhof 
Date:   Sat Jun 28 18:31:26 2014 +0200

Translated German comments in filerec.hxx and doxygen-ify.

Moved general file format description to be included in
class SfxMiniRecordReader documentation.
Changed '@example' to @par Example @code ... @endcode,
since Doxygen interprets @example as "all this file is an example",
which is not what was meant.

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

diff --git a/include/svl/filerec.hxx b/include/svl/filerec.hxx
index 68729bb..bc9b962 100644
--- a/include/svl/filerec.hxx
+++ b/include/svl/filerec.hxx
@@ -28,7 +28,7 @@
 #define SFX_REC_PRETAG_EXT  sal_uInt8(0x00) // Pre-Tag for 
Extended-Records
 #define SFX_REC_PRETAG_EOR  sal_uInt8(0xFF) // Pre-Tag for 
End-Of-Records
 
-#define SFX_REC_TYPE_NONE   sal_uInt8(0x00) // unknown Record-Typ
+#define SFX_REC_TYPE_NONE   sal_uInt8(0x00) // unknown Record type
 #define SFX_REC_TYPE_FIRST  sal_uInt8(0x01)
 #define SFX_REC_TYPE_SINGLE sal_uInt8(0x01) // 
Single-Content-Record
 #define SFX_REC_TYPE_FIXSIZEsal_uInt8(0x02) // 
Fix-Size-Multi-Content-Record
@@ -53,114 +53,7 @@
 #endif
 #endif
 
-/*  [Fileformat]
-
-Jeder Record beginnt mit einem Byte, dem sogenannten 'Pre-Tag'.
-
-Ist dieses 'Pre-Tag' == 0x00, dann handelt es sich um einen Extended-
-Record, dessen Typ durch ein weiteres Byte an Position 5 n?her
-beschrieben wird:
-
-0x01:   SfxSingleRecord
-0x02:   SfxMultiFixRecord
-0x03+0x04:  SfxMultiVarRecord
-0x07+0x08:  SfxMultiMixRecord
-(Alle weiteren Record-Typ-Kennungen sind reserviert.)
-
-I.d.R. werden File-Formate schon aus Performance-Gr"unden so aufgebaut,
-da\s beim Lesen jeweils vorher schon feststeht, welcher Record-Typ
-vorliegt. Diese Kennung dient daher hautps"achlich der "Uberpr"ufung
-und File-Viewern, die das genaue File-Format (unterhalb der Records)
-nicht kennen.
-
-Der 'SfxMiniRecordReader' verf"ugt dazu auch "uber eine statische
-Methode 'ScanRecordType()', mit der festgestellt werden kann, welcher
-Record-Typ in dem "ubergebenen Stream zu finden ist.
-
-Ein 'Pre-Tag' mit dem Wert 0xFF ist als Terminator reserviert.
-Terminatoren werden verwendet, um das Suchen nach einem speziellen
-Record zu terminieren, d.h. ist er bis dorthin nicht gefunden, wird
-auch nicht weitergesucht.
-
-Bei allen anderen Werten des 'Pre-Tags' (also von 0x01 bis 0xFE)
-handelt es sich um einen zum SW3 kompatbilen Record, der hier
-'SfxMiniRecord' genannt wird, er kann daher mit einem 
-gelesen werden.
-
-Beginnt ein Record mit 0x44 k"onnte es sich um einen Drawing-Engine-
-Record handeln. Dies ist dann der Fall, wenn die folgenden drei Bytes
-die Zeichenkette 'RMD' bzw. 'RVW' ergeben (zusammen mit 'D'==0x44
-ergibt dies die K"urzel f"ur 'DRaw-MoDel' bzw. 'DRaw-VieW'). Records
-dieser Art k"onnen von den hier dargestellten Klassen weder gelesen,
-noch in irgendeiner Weise interpretiert werden. Einzig die Methode
-'ScanRecordType()' kann sie erkennen - weitere Behandlung obliegt
-jedoch der Anwendungsprogrammierung.
-
-Diese drei Bytes an den Positionen 2 bis 4 enthalten normalerweise
-die Gr"o\se des Records ohne Pre-Tag und Gr"o\sen-Bytes selbst,
-also die Restgr"o\se nach diesem 4-Byte-Header.
-
-Struktur des Mini-Records:
-
-1 sal_uInt8 Pre-Tag
-3 sal_uInt8 OffsetToEndOfRec
-OffsetToEndOfRec*   1 sal_uInt8 Content
-
-Bei den Extended-Reords folgt auf diesen 4-Byte-Header ein erweiterter
-Header, der zun"achst den o.g. Record-Typ, dann eine Versions-Kennung
-sowie ein Tag enth"alt, welches den Inhalt kennzeichnet.
-
-Struktur des Extended-Records:
-
-1 sal_uInt8 Pre-Tag (==0x00)
-3 sal_uInt8 OffsetToEndOfRec
-OffsetToEndOfRec*   1 sal_uInt8 Content
-1 sal_uInt8 Record-Type
-1 sal_uInt8 Version
-2 sal_uInt8 Tag
-ContentSize*1 sal_uInt8 Content
-
-(ContentSize = OffsetToEndOfRec - 8)
-
-[Anmerkung]
-
-Der Aufbau der Records wird wie folgt begr"undet:
-
-Der SW-Record-Typ war zuerst vorhanden, mu\ste also 1:1 "ubernommen
-werden. Zum Gl"uck wurden einige Record-Tags nicht verwendet, (Z.B.
-0x00 und 0xFF).
-=>  1. Byte 0x00 kann als Kennung f"ur erweiterte

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sd/source

[Andrzej Hunt]

 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |   13 +
 sd/source/ui/view/outlnvs2.cxx |   11 +++
 2 files changed, 24 insertions(+)

New commits:
commit 62afc8fcaa527daa1f762ed7f27bcf71be3640c6
Author: Andrzej Hunt 
Date:   Fri Jun 27 18:20:14 2014 +0200

fdo#63378 Enable Impress Remote Dialog menu item for all view shells.

Change-Id: I47f040c1463b4be648d411c2f7f0070b8aed3e9c
(cherry picked from commit d61468314bbfd2a79929b48e62d7e5ed354ab79b)
Reviewed-on: https://gerrit.libreoffice.org/9975
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx 
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 5999175..9705be4 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -284,6 +284,19 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
 }
 break;
 
+case SID_REMOTE_DLG:
+{
+#ifdef ENABLE_SDREMOTE
+ SdAbstractDialogFactory* pFact = 
SdAbstractDialogFactory::Create();
+ VclAbstractDialog* pDlg = pFact ?
+ pFact->CreateRemoteDialog( 
mrSlideSorter.GetContentWindow().get() ) :
+ 0;
+ if (pDlg)
+ pDlg->Execute();
+#endif
+}
+break;
+
 default:
 break;
 }
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 9b88288..99b1092 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -287,6 +287,17 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
 }
 break;
 
+case SID_REMOTE_DLG:
+{
+#ifdef ENABLE_SDREMOTE
+ SdAbstractDialogFactory* pFact = 
SdAbstractDialogFactory::Create();
+ VclAbstractDialog* pDlg = pFact ? 
pFact->CreateRemoteDialog(GetActiveWindow()) : 0;
+ if (pDlg)
+ pDlg->Execute();
+#endif
+}
+break;
+
 case SID_CUSTOMSHOW_DLG:
 {
 SetCurrentFunction( FuCustomShowDlg::Create( this, 
GetActiveWindow(), pOlView, GetDoc(), rReq ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source

[Andrzej Hunt]

 sd/source/ui/slidesorter/controller/SlsSlotManager.cxx |   13 +
 sd/source/ui/view/outlnvs2.cxx |   11 +++
 2 files changed, 24 insertions(+)

New commits:
commit d9429698b9784634768e831248f1e081ed3d6114
Author: Andrzej Hunt 
Date:   Fri Jun 27 18:20:14 2014 +0200

fdo#63378 Enable Impress Remote Dialog menu item for all view shells.

Change-Id: I47f040c1463b4be648d411c2f7f0070b8aed3e9c
(cherry picked from commit d61468314bbfd2a79929b48e62d7e5ed354ab79b)
Reviewed-on: https://gerrit.libreoffice.org/9976
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx 
b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
index 71e7b2f..d2772bc 100644
--- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
@@ -284,6 +284,19 @@ void SlotManager::FuTemporary (SfxRequest& rRequest)
 }
 break;
 
+case SID_REMOTE_DLG:
+{
+#ifdef ENABLE_SDREMOTE
+ SdAbstractDialogFactory* pFact = 
SdAbstractDialogFactory::Create();
+ VclAbstractDialog* pDlg = pFact ?
+ pFact->CreateRemoteDialog( 
mrSlideSorter.GetContentWindow().get() ) :
+ 0;
+ if (pDlg)
+ pDlg->Execute();
+#endif
+}
+break;
+
 default:
 break;
 }
diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx
index 6bdb2b3..1278094 100644
--- a/sd/source/ui/view/outlnvs2.cxx
+++ b/sd/source/ui/view/outlnvs2.cxx
@@ -287,6 +287,17 @@ void OutlineViewShell::FuTemporary(SfxRequest &rReq)
 }
 break;
 
+case SID_REMOTE_DLG:
+{
+#ifdef ENABLE_SDREMOTE
+ SdAbstractDialogFactory* pFact = 
SdAbstractDialogFactory::Create();
+ VclAbstractDialog* pDlg = pFact ? 
pFact->CreateRemoteDialog(GetActiveWindow()) : 0;
+ if (pDlg)
+ pDlg->Execute();
+#endif
+}
+break;
+
 case SID_CUSTOMSHOW_DLG:
 {
 SetCurrentFunction( FuCustomShowDlg::Create( this, 
GetActiveWindow(), pOlView, GetDoc(), rReq ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - chart2/source

[Kohei Yoshida]

 chart2/source/controller/dialogs/DataBrowserModel.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 556412d3fa3916b1e1d0375fa999fdf92136b64e
Author: Kohei Yoshida 
Date:   Thu Jun 26 14:51:47 2014 -0400

fdo#79151: No need to offset column index by category labels.

In fact, doing so would lead to a corrupt internal data table.  The
internal data stores category labels separately from the column data, so
there is no reason why we need to offset for category labels here.

(cherry picked from commit ecde8155fefcdacb08177a10a4eddc24f6675b0b)

Conflicts:
chart2/source/controller/dialogs/DataBrowserModel.cxx

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

diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx 
b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 8a85f8e..ceccad0 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -345,9 +345,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 
nAfterColumnIndex )
 
 if( xChartType.is())
 {
-sal_Int32 nOffset = 0;
-if( xDiagram.is() && lcl_ShowCategories( xDiagram ))
-nOffset=getCategoryColumnCount();
 // get shared sequences of current series
 Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, 
uno::UNO_QUERY );
 lcl_tSharedSeqVec aSharedSequences;
@@ -365,7 +362,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 
nAfterColumnIndex )
 xSource->getDataSequences());
 sal_Int32 nSeqIdx = 0;
 sal_Int32 nSeqSize = aLSequences.getLength();
-nStartCol -= (nOffset - 1);
 for( sal_Int32 nIndex = nStartCol;
  (nSeqIdx < nSeqSize);
  ++nSeqIdx )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 source/text/scalc/01/04060106.xhp |   47 ++
 1 file changed, 47 insertions(+)

New commits:
commit 74944d4f7fb26dd0db7a94cebf8c66d3023b4aa6
Author: Olivier Hallot 
Date:   Fri Jun 27 22:09:38 2014 -0300

Fix fdo#80438: help entries of Excel new functions

write help entrie for FLOOR.PRECISE, CEILING.PRECISE and ISO.CEILING 
spreadsheet functions

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

diff --git a/source/text/scalc/01/04060106.xhp 
b/source/text/scalc/01/04060106.xhp
index 1b7a807..9329c36 100644
--- a/source/text/scalc/01/04060106.xhp
+++ b/source/text/scalc/01/04060106.xhp
@@ -725,6 +725,38 @@ oldref="338">Example
 =CEILING(-11;-2;1) returns 
-12see also FLOOR, EVEN, ODD, MROUND,   
 INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP
 
+
+CEILING.PRECISE function
+rounding;up to multiples of significance
+mw added one entry
+
+CEILING.PRECISE
+Rounds a number up to the nearest 
multiple of Significance, regardless of sign of Significance
+Syntax
+CEILING.PRECISE(Number; Significance)
+Number (required) is the number that is to be rounded 
up.
+Significance (optional) is the number to whose 
multiple the value is to be rounded up.
+Example
+
+=CEILING.PRECISE(-11;-2) returns -10
+see also FLOOR, EVEN, ODD, MROUND, INT, TRUNC, ROUND, ROUNDDOWN, 
ROUNDUP
+
+
+ISO.CEILING function
+rounding;up to multiples of significance
+mw added one entry
+
+ISO.CEILING
+Rounds a number up to the nearest 
multiple of Significance, regardless of sign of Significance
+Syntax
+ISO.CEILING(Number; Significance)
+Number (required) is the number that is to be rounded 
up.
+Significance (optional) is the number to whose 
multiple the value is to be rounded up.
+Example
+
+=ISO.CEILING(-11;-2) returns -10
+see also FLOOR, EVEN, ODD, MROUND, INT, TRUNC, ROUND, ROUNDDOWN, 
ROUNDUP
+
 
 PI 
function
 
@@ -1306,6 +1338,21 @@ oldref="507">Example
 =ODD(-3.1) returns -5.see also 
CEILING, FLOOR, EVEN, MROUND,   
 INT, TRUNC, ROUND, ROUNDDOWN, ROUNDUP
 
+
+FLOOR.PRECISE function
+rounding;down to nearest multiple of 
significance
+mw added one entry
+
+FLOOR.PRECISE
+Rounds a number down to the nearest 
multiple of Significance, regardless of sign of Significance
+Syntax
+FLOOR.PRECISE(Number; Significance)
+Number is the number that is to be rounded 
down.
+Significance is the value to whose multiple the 
number is to be rounded down.
+Example
+ =FLOOR.PRECISE( -11;-2) returns 
-12
+see also CEILING, EVEN, ODD, MROUND,INT, TRUNC, ROUND, ROUNDDOWN, 
ROUNDUP,  
+
 
 FLOOR function
 rounding;down to nearest multiple of 
significance
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit 0e0d62f458f7ae157684dff926fd0a834a6164b5
Author: Olivier Hallot 
Date:   Fri Jun 27 22:09:38 2014 -0300

Updated core
Project: help  74944d4f7fb26dd0db7a94cebf8c66d3023b4aa6

Fix fdo#80438: help entries of Excel new functions

write help entrie for FLOOR.PRECISE, CEILING.PRECISE and ISO.CEILING 
spreadsheet functions

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

diff --git a/helpcontent2 b/helpcontent2
index 5a03441..74944d4 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5a0344117e741d078b564f54f07333946a6567c4
+Subproject commit 74944d4f7fb26dd0db7a94cebf8c66d3023b4aa6
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 AllLangHelp_scalc.mk  |1 
 source/text/scalc/01/func_numbervalue.xhp |   48 ++
 2 files changed, 49 insertions(+)

New commits:
commit 0b6e8e1c94332513d8f49fc9975f31c6be860847
Author: Olivier Hallot 
Date:   Sat Jun 28 22:32:17 2014 -0300

Fix fdo#80656. Help for NUMBERVALUE Calc function

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

diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk
index 097dc2d..c4ba90b 100644
--- a/AllLangHelp_scalc.mk
+++ b/AllLangHelp_scalc.mk
@@ -192,6 +192,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\
 helpcontent2/source/text/scalc/01/func_minute \
 helpcontent2/source/text/scalc/01/func_month \
 helpcontent2/source/text/scalc/01/func_networkdays \
+helpcontent2/source/text/scalc/01/func_numbervalue \
 helpcontent2/source/text/scalc/01/func_now \
 helpcontent2/source/text/scalc/01/func_second \
 helpcontent2/source/text/scalc/01/func_time \
diff --git a/source/text/scalc/01/func_numbervalue.xhp 
b/source/text/scalc/01/func_numbervalue.xhp
new file mode 100644
index 000..45006a9
--- /dev/null
+++ b/source/text/scalc/01/func_numbervalue.xhp
@@ -0,0 +1,48 @@
+
+
+  
+  
+
+  NUMBERVALUE 
+  /text/scalc/01/func_numbervalue.xhp
+
+  
+  
+
+  NUMBERVALUE function
+
+
+
+  
+NUMBERVALUE
+  
+
+
+  Convert text to number, in a 
locale-independent way.
+
+Constraints: LEN(decimal_separator) = 1, decimal_separator shall 
not appear in group_separator
+Syntax
+NUMBERVALUE("Text";decimal_separator;group_separator)
+Text is a valid number expression and must be entered 
with quotation marks.
+decimal_separator (optional) defines the character 
used as the decimal separator.
+group_separator (optional) defines the character(s) 
used as the group separator.
+Example
+=NUMBERVALUE("123.456";".";",") yields 
123.456
+  
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 source/text/scalc/01/04060181.xhp |   39 ++
 1 file changed, 39 insertions(+)

New commits:
commit 34bf0f108f0ddafa5675b3723675a7cd611d274b
Author: Olivier Hallot 
Date:   Sun Jun 29 08:41:02 2014 -0300

Fix fdo#80446: Help entries for BETA.DIST BETA.INV

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

diff --git a/source/text/scalc/01/04060181.xhp 
b/source/text/scalc/01/04060181.xhp
index 1bf97fc..24d7963 100644
--- a/source/text/scalc/01/04060181.xhp
+++ b/source/text/scalc/01/04060181.xhp
@@ -163,6 +163,25 @@
  
 =BETAINV(0.5;5;10) returns the value 
0.33.
   
+  
+BETA.INV function
+ cumulative probability density function;inverse 
of
+mw added one entry
+
+BETA.INV
+ Returns the inverse of 
the cumulative beta probability density function.
+ Syntax
+ BETA.INV(Number; Alpha; Beta; Start; End)
+ Number is the value between 
Start and End at which to evaluate the 
function.
+ Alpha is a parameter to the 
distribution.
+ Beta is a parameter to the 
distribution.
+ Start (optional) is the lower bound for 
Number.
+ End (optional) is the upper bound for 
Number.
+ 
+ Example
+ 
+=BETA.INV(0.5;5;10) returns the value 
0.3257511553.
+  
   
 BETADIST function
  cumulative probability density 
function;calculating
@@ -194,6 +213,26 @@
  
 =BETADIST(0.75;3;4) returns the value 
0.96
   
+  
+BETA.DIST function
+ cumulative probability density 
function;calculating
+mw added one entry
+
+BETA.DIST
+ Returns the beta 
function.
+ Syntax
+ BETA.DIST(Number; Alpha; Beta; Cumulative; Start; End)
+ Number (required) is the value between 
Start and End at which to evaluate the 
function.
+ Alpha (required) is a parameter to the 
distribution.
+ Beta (required) is a parameter to the 
distribution.
+ Cumulative (required) can be 0 or 
False to calculate the probability density function. It can be any other value 
or True or omitted to calculate the cumulative distribution 
function.
+ Start (optional) is the lower bound for 
Number.
+ End (optional) is the upper bound for 
Number.
+ 
+ Examples
+ =BETA.DIST(2;8;10;1;1;3) returns 
the value 0.6854706
+ =BETA.DIST(2;8;10;0;1;3) returns 
the value 1.4837646
+  
   
 BINOMDIST function
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit ae2302a19df52e53bb191e67295d2c4c3773f8b7
Author: Olivier Hallot 
Date:   Sun Jun 29 08:41:02 2014 -0300

Updated core
Project: help  34bf0f108f0ddafa5675b3723675a7cd611d274b

Fix fdo#80446: Help entries for BETA.DIST BETA.INV

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

diff --git a/helpcontent2 b/helpcontent2
index 74944d4..34bf0f1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 74944d4f7fb26dd0db7a94cebf8c66d3023b4aa6
+Subproject commit 34bf0f108f0ddafa5675b3723675a7cd611d274b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit bc73014e16bf0ae3c19d68b3219dee0b7e3ab2bc
Author: Olivier Hallot 
Date:   Sat Jun 28 22:32:17 2014 -0300

Updated core
Project: help  0b6e8e1c94332513d8f49fc9975f31c6be860847

Fix fdo#80656. Help for NUMBERVALUE Calc function

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

diff --git a/helpcontent2 b/helpcontent2
index 34bf0f1..0b6e8e1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 34bf0f108f0ddafa5675b3723675a7cd611d274b
+Subproject commit 0b6e8e1c94332513d8f49fc9975f31c6be860847
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

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

New commits:
commit f537e8dc7968b6a6bd591aa6cb5f607e5452417e
Author: Olivier Hallot 
Date:   Sun Jun 29 18:06:42 2014 -0300

Updated core
Project: help  5a0344117e741d078b564f54f07333946a6567c4

Fix fdo#80442, Calc DBCS functions

write help pages for LEFTB, LENB, MIDB and RIGHTB spreadsheet functions 
working on DBCS

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

diff --git a/helpcontent2 b/helpcontent2
index f4ae6be..5a03441 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f4ae6be5fabc4f86cffacb5b6d4fd5eb6568a02f
+Subproject commit 5a0344117e741d078b564f54f07333946a6567c4
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - chart2/source

[Kohei Yoshida]

 chart2/source/controller/dialogs/DataBrowserModel.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit eb4a6f38829bfb9e2569c2a9b6e0e0ad6277555c
Author: Kohei Yoshida 
Date:   Thu Jun 26 14:51:47 2014 -0400

fdo#79151: No need to offset column index by category labels.

In fact, doing so would lead to a corrupt internal data table.  The
internal data stores category labels separately from the column data, so
there is no reason why we need to offset for category labels here.

(cherry picked from commit ecde8155fefcdacb08177a10a4eddc24f6675b0b)

Conflicts:
chart2/source/controller/dialogs/DataBrowserModel.cxx

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

diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx 
b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 8bfa963..e3544e0 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -344,9 +344,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 
nAfterColumnIndex )
 
 if( xChartType.is())
 {
-sal_Int32 nOffset = 0;
-if( xDiagram.is() && lcl_ShowCategories( xDiagram ))
-nOffset=getCategoryColumnCount();
 // get shared sequences of current series
 Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, 
uno::UNO_QUERY );
 lcl_tSharedSeqVec aSharedSequences;
@@ -364,7 +361,6 @@ void DataBrowserModel::insertDataSeries( sal_Int32 
nAfterColumnIndex )
 xSource->getDataSequences());
 sal_Int32 nSeqIdx = 0;
 sal_Int32 nSeqSize = aLSequences.getLength();
-nStartCol -= (nOffset - 1);
 for( sal_Int32 nIndex = nStartCol;
  (nSeqIdx < nSeqSize);
  ++nSeqIdx )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Olivier Hallot]

 source/text/scalc/01/04060110.xhp |   57 ++
 1 file changed, 57 insertions(+)

New commits:
commit 5a0344117e741d078b564f54f07333946a6567c4
Author: Olivier Hallot 
Date:   Sun Jun 29 18:06:42 2014 -0300

Fix fdo#80442, Calc DBCS functions

write help pages for LEFTB, LENB, MIDB and RIGHTB spreadsheet functions 
working on DBCS

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

diff --git a/source/text/scalc/01/04060110.xhp 
b/source/text/scalc/01/04060110.xhp
index 557fb7f..e55d4b9 100644
--- a/source/text/scalc/01/04060110.xhp
+++ b/source/text/scalc/01/04060110.xhp
@@ -321,6 +321,19 @@
  
 =LEFT("output";3) returns 
“out”.
   
+  
+LEFTB function
+
+
+LEFTB
+ Returns the first characters 
of a DBCS text.
+ Syntax
+ LEFTB("Text"; Number_bytes)
+ Text is the text where the initial partial 
words are to be determined.
+ Number_bytes (optional) specifies the number 
of characters you want LEFTB to extract, based on bytes. If this parameter is 
not defined, one character is returned.
+ Example
+ =LEFTB("output";3) returns 
“out”.
+  
   
 LEN function
 
@@ -340,6 +353,21 @@
  
 =LEN(12345.67) returns 8.
   
+  
+LENB function
+
+
+LENB
+ For double-byte character set 
(DBCS) languages, returns the number of bytes used to represent the characters 
in a text string.
+ Syntax
+ LENB("Text")
+ Text is the text whose length is to be 
determined.
+ Example
+ 
+ =LENB("Good Afternoon") returns 
14.
+ 
+=LENB(12345.67) returns 8.
+  
   
 LOWER function
 
@@ -378,6 +406,21 @@
  
 =MID("office";2;2) returns 
ff.
   
+  
+MIDB function
+
+
+MIDB
+ Returns a text string of a 
DBCS text. The parameters specify the starting position and the number of 
characters.
+ Syntax
+ MIDB("Text"; Start; Number_bytes)
+ Text is the text containing the characters 
to extract.
+ Start is the position of the first character 
in the text to extract.
+ Number_bytes specifies the number of 
characters MIDB will return from text, in bytes.
+ Example
+ 
+=MIDB("office";2;2) returns 
ff.
+  
   
 PROPER function
 
@@ -458,6 +501,20 @@
  
 =RIGHT("Sun";2) returns un.
   
+  
+RIGHTB function
+
+
+RIGHTB
+ Returns the last character 
or characters of a text with double bytes characters sets 
(DBCS).
+ Syntax
+ RIGHTB("Text"; Number_bytes)
+ Text is the text of which the right part is 
to be determined.
+ Number_bytes (optional) specifies the number 
of characters you want RIGHTB to extract, based on bytes.
+ Example
+ 
+=RIGHTB("Sun";2) returns un.
+  
   
 ROMAN function
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 64945] inconvenient localized symbol code

[bugzilla-daemon]

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

Thomas Arnhold  changed:

   What|Removed |Added

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

-- 
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/gsoc14-personas' - cui/source officecfg/registry

[Rachit Gupta]

 cui/source/options/personalization.cxx |   25 ---
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   29 +++--
 2 files changed, 44 insertions(+), 10 deletions(-)

New commits:
commit 888a0e4ceb8d379f6c44d449863ea8c1b5a599e2
Author: Rachit Gupta 
Date:   Mon Jun 30 15:28:05 2014 +0530

Changed application of personas through extensions procedure.

The PersonasEntry template in the registry now stores the setting as
splitted values rather than ';' separated terms. The corresponding ';'
separated setting is prepared and stored.

Change-Id: I154d519c475a48763a75b5c35ad20f170c1d7996

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index 1cc8b75..e78c779 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -375,8 +375,8 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 for( ; nIndex < nLength; nIndex++ )
 {
 Reference< XPropertySet > xPropertySet( 
officecfg::Office::Common::Misc::PersonasList::get()->getByName( 
installedPersonas[nIndex] ), UNO_QUERY_THROW );
+OUString aPersonaName, aPreviewFile, aHeaderFile, aFooterFile, 
aTextColor, aAccentColor, aPersonaSettings;
 Any aValue = xPropertySet->getPropertyValue( "PersonaPreview" );
-OUString aPreviewFile;
 aValue >>= aPreviewFile;
 INetURLObject aURLObj( aPreviewFile );
 aFilter.ImportGraphic( aGraphic, aURLObj );
@@ -384,11 +384,24 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 m_vExtensionPersonas[nCount]->Show();
 m_vExtensionPersonas[nCount++]->SetModeImage( Image( aBmp ) );
 
-aValue = xPropertySet->getPropertyValue( "PersonaSettings" );
-OUString sPersonaSettings;
-aValue >>= sPersonaSettings;
-rtl::Bootstrap::expandMacros( sPersonaSettings );
-m_vExtensionPersonaSettings.push_back( sPersonaSettings );
+aValue = xPropertySet->getPropertyValue( "PersonaName" );
+aValue >>= aPersonaName;
+
+aValue = xPropertySet->getPropertyValue( "PersonaHeader" );
+aValue >>= aHeaderFile;
+
+aValue = xPropertySet->getPropertyValue( "PersonaFooter" );
+aValue >>= aFooterFile;
+
+aValue = xPropertySet->getPropertyValue( "PersonaTextColor" );
+aValue >>= aTextColor;
+
+aValue = xPropertySet->getPropertyValue( "PersonaAccentColor" );
+aValue >>= aAccentColor;
+
+aPersonaSettings = aHeaderFile + ";" + aFooterFile + ";" + aTextColor 
+ ";" + aAccentColor;
+rtl::Bootstrap::expandMacros( aPersonaSettings );
+m_vExtensionPersonaSettings.push_back( aPersonaSettings );
 }
 }
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index d5e926b..6548445 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -810,16 +810,37 @@
   
 Stores the details of the installed personas.
   
+  
+
+  The Persona's name
+
+  
   
 
   Name of the preview file for the Persona to show in the 
UI
 
   
-  
+  
 
-  Names of the header and footer images, and colors for text and
-accent.  When set, the value has form
-"header.jpg;footer.jpg;#RGBTXT;#RGBACC".
+  Name of the header file for the Persona
+
+
+  
+  
+
+  Name of the footer file for the Persona
+
+
+  
+  
+
+  Value of the text color for the Persona
+
+
+  
+  
+
+  Value of the accent color for the Persona
 
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Register to the LibreOffice conference

[Sophie]

Hi all,

If you plan to attend the LibreOffice conference in Bern, please don't
forget to register, this will help the organization team a lot :)
To do so, follow this link:
http://conference.libreoffice.org/2014/registration/

Thanks!
Cheers
Sophie
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Norbert Thiebaud]

 include/vcl/settings.hxx |1 +
 solenv/gbuild/platform/macosx.mk |3 +++
 vcl/source/app/settings.cxx  |9 +
 vcl/source/window/window.cxx |7 +--
 4 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit c403286de572272ac7d2f1f1012d69d058f7e4f3
Author: Norbert Thiebaud 
Date:   Sun Jun 29 23:42:32 2014 +0200

use VCL_HIDE_WINDOWS env on Mac to 'simulate' headless mode on Mac

Building, and running the unit/subsequent test on Mac cause massive amount
of flashing windows creation/destruction that make building with test
very annoying on a box used for other purposes.
This patch prevent the windows to be actually displayed hence mitigating
the problem

Change-Id: Ied2a36699b50856e0c4e6b618212481796ec99d3

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 0a6c6e9..021161f 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -588,6 +588,7 @@ public:
 boolGetDisablePrinting() const;
 voidSetEnableLocalizedDecimalSep( bool bEnable 
);
 boolGetEnableLocalizedDecimalSep() const;
+boolGetPseudoHeadless() const;
 
 booloperator ==( const MiscSettings& rSet ) 
const;
 booloperator !=( const MiscSettings& rSet ) 
const;
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 8d6f834..a40e054 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -17,6 +17,9 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
+# to avoid flashing windows during tests
+export VCL_HIDE_WINDOWS=1
+
 gb_SDKDIR := $(MACOSX_SDK_PATH)
 
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 1e6050c..d93ffe9 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -213,6 +213,7 @@ struct ImplMiscData
 TriStatemnEnableATT;
 boolmbEnableLocalizedDecimalSep;
 TriStatemnDisablePrinting;
+boolmbPseudoHeadless;
 };
 
 struct ImplHelpData
@@ -2345,6 +2346,8 @@ ImplMiscData::ImplMiscData()
 mnDisablePrinting   = TRISTATE_INDET;
 static const char* pEnv = getenv("SAL_DECIMALSEP_ENABLED" ); // set 
default without UI
 mbEnableLocalizedDecimalSep = (pEnv != NULL);
+pEnv = getenv("VCL_HIDE_WINDOWS"); // do not display any windows
+mbPseudoHeadless = (pEnv != NULL);
 }
 
 ImplMiscData::ImplMiscData( const ImplMiscData& rData )
@@ -2352,6 +2355,7 @@ ImplMiscData::ImplMiscData( const ImplMiscData& rData )
 mnEnableATT = rData.mnEnableATT;
 mnDisablePrinting   = rData.mnDisablePrinting;
 mbEnableLocalizedDecimalSep = rData.mbEnableLocalizedDecimalSep;
+mbPseudoHeadless = rData.mbPseudoHeadless;
 }
 
 MiscSettings::MiscSettings()
@@ -2539,6 +2543,11 @@ bool MiscSettings::GetEnableLocalizedDecimalSep() const
 return mpData->mbEnableLocalizedDecimalSep;
 }
 
+bool MiscSettings::GetPseudoHeadless() const
+{
+return mpData->mbPseudoHeadless;
+}
+
 ImplHelpData::ImplHelpData()
 {
 mnTipDelay  = 500;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 396b66e..7fb93e2 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2414,8 +2414,11 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
 mpWindowImpl->mbSuppressAccessibilityEvents = false;
 
 mpWindowImpl->mbPaintFrame = true;
-bool bNoActivate = (nFlags & (SHOW_NOACTIVATE|SHOW_NOFOCUSCHANGE)) 
? true : false;
-mpWindowImpl->mpFrame->Show( true, bNoActivate );
+if 
(!Application::GetSettings().GetMiscSettings().GetPseudoHeadless())
+{
+bool bNoActivate = (nFlags & 
(SHOW_NOACTIVATE|SHOW_NOFOCUSCHANGE)) ? true : false;
+mpWindowImpl->mpFrame->Show( true, bNoActivate );
+}
 if( aDogTag.IsDead() )
 return;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/rtfexport/data/fdo80167.rtf |6 ++
 sw/qa/extras/rtfexport/rtfexport.cxx |6 ++
 sw/source/filter/ww8/docxexport.hxx  |2 ++
 sw/source/filter/ww8/rtfexport.hxx   |5 +
 sw/source/filter/ww8/wrtww8.hxx  |5 +
 sw/source/filter/ww8/ww8atr.cxx  |   13 ++---
 6 files changed, 34 insertions(+), 3 deletions(-)

New commits:
commit 124c2c3b015a7a9980dae67e1ca6844e66fa6258
Author: Miklos Vajna 
Date:   Fri Jun 27 21:28:36 2014 +0200

fdo#80167 RTF export: don't loose page breaks

DOCX export tries to write accurately both  and
, while DOC/RTF prefers just the page break before
paragraph attribute. Given that these later two exporters are not
adapted to write their equivalent of  at all, add a virtual method
to determine if writing page breaks as "page break before" is preferred
or not, that'll give the expected RTF export result.

This conditionally reverts commit
a31fbb53dba76736b37213b98b64937f05929a67 (fdo#74566:DOCX: Preservation
 tag for Break to Next Page, 2014-02-06).

(cherry picked from commit 8100100298b877765e1781fb0eed285e82749ad1)

Conflicts:
sw/qa/extras/rtfexport/rtfexport.cxx

Change-Id: I4a5dd295b07739a570cd8cc6709561e64d031273
Reviewed-on: https://gerrit.libreoffice.org/9945
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/sw/qa/extras/rtfexport/data/fdo80167.rtf 
b/sw/qa/extras/rtfexport/data/fdo80167.rtf
new file mode 100644
index 000..3aa9dd3
--- /dev/null
+++ b/sw/qa/extras/rtfexport/data/fdo80167.rtf
@@ -0,0 +1,6 @@
+{\rtf1
+\pard\plain
+one\par
+\pard\page\par
+\pard two\par
+}
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index de0ae10..e4ed685 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -644,6 +644,12 @@ DECLARE_RTFEXPORT_TEST(testFdo77600, "fdo77600.rtf")
 CPPUNIT_ASSERT_EQUAL(OUString("Arial"), 
getProperty(getRun(getParagraph(1), 3), "CharFontName"));
 }
 
+DECLARE_RTFEXPORT_TEST(testFdo80167, "fdo80167.rtf")
+{
+// Problem was that after export, the page break was missing, so this was 
1.
+CPPUNIT_ASSERT_EQUAL(2, getPages());
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/docxexport.hxx 
b/sw/source/filter/ww8/docxexport.hxx
index 950db24..9ab2db9 100644
--- a/sw/source/filter/ww8/docxexport.hxx
+++ b/sw/source/filter/ww8/docxexport.hxx
@@ -124,6 +124,8 @@ public:
 
 virtual bool ignoreAttributeForStyles( sal_uInt16 nWhich ) const 
SAL_OVERRIDE;
 
+virtual bool PreferPageBreakBefore() const SAL_OVERRIDE { return false; }
+
 /// Guess the script (asian/western).
 virtual bool CollapseScriptsforWordOk( sal_uInt16 nScript, sal_uInt16 
nWhich ) SAL_OVERRIDE;
 
diff --git a/sw/source/filter/ww8/rtfexport.hxx 
b/sw/source/filter/ww8/rtfexport.hxx
index aebb839..c384289 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -80,6 +80,11 @@ public:
 return false;
 }
 
+virtual bool PreferPageBreakBefore() const SAL_OVERRIDE
+{
+return true;
+}
+
 /// Guess the script (asian/western).
 virtual bool CollapseScriptsforWordOk(sal_uInt16 nScript, sal_uInt16 
nWhich) SAL_OVERRIDE;
 
diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx
index 9229fa5..b41abc4 100644
--- a/sw/source/filter/ww8/wrtww8.hxx
+++ b/sw/source/filter/ww8/wrtww8.hxx
@@ -645,6 +645,9 @@ public:
 /// Used to filter out attributes that can be e.g. written to .doc but not 
to .docx
 virtual bool ignoreAttributeForStyles( sal_uInt16 /*nWhich*/ ) const { 
return false; }
 
+/// If saving page break is preferred as a paragraph attribute (yes) or as 
a special character (no).
+virtual bool PreferPageBreakBefore() const = 0;
+
 /// Guess the script (asian/western).
 ///
 /// Sadly word does not have two different sizes for asian font size and
@@ -964,6 +967,8 @@ public:
 /// False for WW6, true for WW8.
 virtual bool SupportsUnicode() const SAL_OVERRIDE { return bWrtWW8; }
 
+virtual bool PreferPageBreakBefore() const SAL_OVERRIDE { return true; }
+
 virtual bool SupportsOneColumnBreak() const SAL_OVERRIDE { return false; }
 
 virtual bool FieldsQuoted() const SAL_OVERRIDE { return false; }
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 93c0682..ed6994b 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -3765,9 +3765,16 @@ void AttributeOutputBase::FormatBreak( const 
SvxFmtBreakItem& rBreak )
 break;
 
 case SVX_BREAK_PAGE_BEFORE: // PageBreak
-// From now on(fix for #i77900#) we prefer to save a page 
break as
-// paragraph attribute, this has to be done after the export 
of the
- 

[Libreoffice-commits] core.git: Branch 'feature/aoo-fillattribute' - 3 commits - sc/source svx/source sw/source

[Miklos Vajna]

 sc/source/core/data/documen9.cxx  |2 --
 svx/source/unodraw/unobrushitemhelper.cxx |5 +
 sw/source/core/unocore/unostyle.cxx   |   10 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit fcbe33f5aebbcbc2559d69d9b964bca3f18dc239
Author: Miklos Vajna 
Date:   Mon Jun 30 12:19:23 2014 +0200

getSvxBrushItemFromSourceSet: let XFILL_NONE result in COL_AUTO

I'm not completely sure about this, but without this, automatic color is
translated back as rgba(114, 159, 207, 255), which sounds even worse.

Change-Id: I9f96f26b3797d9e289119a4795d2535b6d72262e

diff --git a/svx/source/unodraw/unobrushitemhelper.cxx 
b/svx/source/unodraw/unobrushitemhelper.cxx
index 5ce03ac..c95c200 100644
--- a/svx/source/unodraw/unobrushitemhelper.cxx
+++ b/svx/source/unodraw/unobrushitemhelper.cxx
@@ -191,10 +191,7 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const 
SfxItemSet& rSourceSet, sal_uInt
 
 if(!pXFillStyleItem || XFILL_NONE == pXFillStyleItem->GetValue())
 {
-// no fill, still need to rescue the evtl. set RGB color, but use as 
transparent color (we have XFILL_NONE)
-Color aFillColor(static_cast< const XFillColorItem& 
>(rSourceSet.Get(XATTR_FILLCOLOR, bSearchInParents)).GetColorValue());
-aFillColor.SetTransparency(0xff);
-
+Color aFillColor(COL_AUTO);
 return SvxBrushItem(aFillColor, nBackgroundID);
 }
 
commit cd555d8d4ceecba3d6b410c9cd2b5b684606dd1d
Author: Miklos Vajna 
Date:   Mon Jun 30 11:57:32 2014 +0200

SwXPageStyle: fix FirstIsShared handling

At least now beans::UnknownPropertyException is not thrown when it is
written.

Change-Id: I6d4f8dbb1ac7caffc4bfdfb9c4c1c84eb9179883

diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 37225c6..1be74cd 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -2860,7 +2860,7 @@ uno::Sequence< beans::PropertyState > 
SwXStyle::getPropertyStates(
 const bool bHeader(SFX_STYLE_FAMILY_PAGE == eFamily && 
sPropName.startsWith("Header"));
 const bool bFooter(SFX_STYLE_FAMILY_PAGE == eFamily && 
sPropName.startsWith("Footer"));
 
-if(bHeader || bFooter)
+if(bHeader || bFooter || sPropName == 
UNO_NAME_FIRST_IS_SHARED)
 {
 const SvxSetItem* pSetItem;
 
@@ -3416,7 +3416,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
 const bool bHeader(rPropName.startsWith("Header"));
 const bool bFooter(rPropName.startsWith("Footer"));
 
-if(bHeader || bFooter)
+if(bHeader || bFooter || rPropName == 
UNO_NAME_FIRST_IS_SHARED)
 {
 // it is a Header/Footer entry, access the SvxSetItem 
containing it's information
 const SvxSetItem* pSetItem = 0;
@@ -3524,7 +3524,7 @@ void SAL_CALL SwXPageStyle::SetPropertyValues_Impl(
 const bool bHeader(rPropName.startsWith("Header"));
 const bool bFooter(rPropName.startsWith("Footer"));
 
-if(bHeader || bFooter)
+if(bHeader || bFooter || rPropName == 
UNO_NAME_FIRST_IS_SHARED)
 {
 const SvxSetItem* pSetItem = 0;
 
@@ -3721,7 +3721,7 @@ uno::Sequence< uno::Any > SAL_CALL 
SwXPageStyle::GetPropertyValues_Impl(
 const bool bHeader(rPropName.startsWith("Header"));
 const bool bFooter(rPropName.startsWith("Footer"));
 
-if(bHeader || bFooter)
+if(bHeader || bFooter || rPropName == 
UNO_NAME_FIRST_IS_SHARED)
 {
 // slot is a Header/Footer slot
 rtl::Reference< SwDocStyleSheet > xStyle( new 
SwDocStyleSheet( *(SwDocStyleSheet*)pBase ) );
@@ -3795,7 +3795,7 @@ uno::Sequence< uno::Any > SAL_CALL 
SwXPageStyle::GetPropertyValues_Impl(
 const bool bHeader(rPropName.startsWith("Header"));
 const bool bFooter(rPropName.startsWith("Footer"));
 
-if(bHeader || bFooter)
+if(bHeader || bFooter || rPropName == 
UNO_NAME_FIRST_IS_SHARED)
 {
 rtl::Reference< SwDocStyleSheet > xStyle( new 
SwDocStyleSheet( *(SwDocStyleSheet*)pBase ) );
 const SfxItemSet& rSet = xStyle->GetItemSet();
commit aebef4d225acaf28f9b2d4ad1f930986c468acd0
Author: Miklos Vajna 
Date:   Mon Jun 30 11:44:07 2014 +0200

Remove stray fprintf

Change-Id: I3cfe170091f11a3039ff6443b283fb45773a4e70

diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index c039862..fc2e7cf 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -1

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

[Michael Stahl]

 solenv/bin/bin_library_info.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ffa354e2defcdc86d93c257159f9428e276c2d2e
Author: Michael Stahl 
Date:   Mon Jun 30 13:08:47 2014 +0200

bin_library_info.sh: popd does not take a directory parameter

Change-Id: I164f03f8ab185fdb71632fd894f94b78bb3d994f

diff --git a/solenv/bin/bin_library_info.sh b/solenv/bin/bin_library_info.sh
index d54d6b3..bb93773 100755
--- a/solenv/bin/bin_library_info.sh
+++ b/solenv/bin/bin_library_info.sh
@@ -35,7 +35,7 @@ get_config_sha()
 {
 pushd ${SRCDIR?} > /dev/null
 cat ${BUILDDIR?}/config_host.mk | git hash-object --stdin
-popd ${SRCDIR?} > /dev/null
+popd > /dev/null
 }
 
 get_library_gbuild_sha()
@@ -48,7 +48,7 @@ get_library_gbuild_sha()
 else
 git ls-tree -d HEAD | "{module?}" | cut -f 1 | cut -d " " -f 3
 fi
-popd ${SRCDIR?} > /dev/null
+popd > /dev/null
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: bin_library_info script

[Michael Stahl]

On 27/06/14 09:44, Marina Latini wrote:
> Hi all,
> JFYI, this is a frequent warning displayed while building master with sources 
> updated today with git pull:
> 
> libreoffice/solenv/bin/bin_library_info.sh: line 38: popd: libreoffice: 
> invalid argument popd: use: popd [-n] [+N | -N]
> 
> libreoffice/solenv/bin/bin_library_info.sh: line 51: popd: libreoffice: 
> invalid argument popd: use: popd [-n] [+N | -N]

can't remember ever seeing this, but probably it depends on some
configure options...

> The involved functions are:
> 
> get_config_sha()
> {
> pushd ${SRCDIR?} > /dev/null
> cat ${BUILDDIR?}/config_host.mk | git hash-object --stdin
> popd ${SRCDIR?} > /dev/null
> }

the error message is correct: "popd" does not take a directory parameter
- fixed on master by commit
ffa354e2defcdc86d93c257159f9428e276c2d2e
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: xmlsecurity build error

[Michael Stahl]

On 27/06/14 16:40, Marina Latini wrote:
> hi all,
>  
> is this a known build error? I updated the master branch today with git pull.
> http://pastebin.com/4NzPNaUC

hello,

no idea what could cause this problem, as a wild guess please try if
this patch avoids the problem:

https://gerrit.libreoffice.org/#/c/9939/

you can cherry-pick it to your local git checkout from the web UI by
clicking on the Download button and then copying the command line after
"Cherry-pick" and running that command.

PS: libreoffice-qa is not the right list for build problems, please use
the development list instead
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - solenv/bin

[Michael Stahl]

 solenv/bin/bin_library_info.sh |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a7540d9f59a172b81f075890f1835b21ec6ab7b3
Author: Michael Stahl 
Date:   Mon Jun 30 13:08:47 2014 +0200

bin_library_info.sh: popd does not take a directory parameter

Change-Id: I164f03f8ab185fdb71632fd894f94b78bb3d994f
(cherry picked from commit ffa354e2defcdc86d93c257159f9428e276c2d2e)

diff --git a/solenv/bin/bin_library_info.sh b/solenv/bin/bin_library_info.sh
index d54d6b3..bb93773 100755
--- a/solenv/bin/bin_library_info.sh
+++ b/solenv/bin/bin_library_info.sh
@@ -35,7 +35,7 @@ get_config_sha()
 {
 pushd ${SRCDIR?} > /dev/null
 cat ${BUILDDIR?}/config_host.mk | git hash-object --stdin
-popd ${SRCDIR?} > /dev/null
+popd > /dev/null
 }
 
 get_library_gbuild_sha()
@@ -48,7 +48,7 @@ get_library_gbuild_sha()
 else
 git ls-tree -d HEAD | "{module?}" | cut -f 1 | cut -d " " -f 3
 fi
-popd ${SRCDIR?} > /dev/null
+popd > /dev/null
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Chained Text Boxes in Draw - Report 29/06/2014

[Matteo Campanelli]

Hi,
I'm trying to implement chained text boxes in Draw, i.e. linking boxes
logically so that text that cannot fit in one can overflow in its successor.

Last week I spent some time to progress on the following subgoals:
- take inspiration from how Writer does it (such a feature is already
present for Writer frames);
- figure out in which part of the code in editeng should be modified to
achieve the same result in Draw.

In general I'm looking at the code to find answers to the following
questions:
(a) how can one observe an overflow of text in a frame/box?
(b) after the point where overflow occurs is found, how to 'assign' the
remaining text to the successor?
(c) what kind of abstractions are used for text (paragraph potions, line
portions) during layouting and how to use them?

Although I found some important references in the code, my findings are
still incomplete and my few small experiments so far have failed.
Below I will try to elaborate more on some related code references I came
to know about.


In Writer
---

First, the way Writer carries around information about
predecessor/successor in chains is by means of a derived class of
SfxPoolItem, SwFmtChain
.
In formatting phase, however, this information seems to be accessed
directly from frames themselves ( SwFlyFrm
 ) by the methods
GetNextLink/GetPrevLink.
Then I tried to figure _how_ this information was used from formatting
routines. Breaking in GetNextLink, however, has a very high rate of hit and
has not been helpful in any way (I couldn't get any intuition from the
backtrace). Neither has been reading manually all the code this method is
referenced by (from Writer docs).
So far I assuemd this was the only point of access to that information
(successor), this hypothesis might be false or that code is too complicated
for my eyes at this stage.

In Draw
--

Although knowing "how Writer does it" would probably be useful, what is
necessary is understanding where to modify formatting code in Draw.
Two crucial methods seems to be:
1) ImpEditEngine::FormatDoc
2) ImpEditEngine::CreateLines (called by FormatDoc for each paragraph)

CreateLines's responsibilities seem to be to restructure the lines in a
paragraph (if they changed) so that they fit in the X boundaries.

FormatDoc's responsibilities seem to include:
- calling CreateLines for each paragraph portion,
- update some view's information if the height of the paragraph changed.

It seems plausible that FormatDoc is the place where an overflow event is
observed (directly or indirectly, by invoked methods) and text should be
assigned to its next link in the chain if such an overflow occurs

This week
-

Current goals include understanding FormatDoc's code further trying to
answer questions (a) and (b) above.

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

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

[Miklos Vajna]

 sw/source/core/unocore/unostyle.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit ae5f568798d28cd0104e391338e83bb07acf6c03
Author: Miklos Vajna 
Date:   Mon Jun 30 13:46:04 2014 +0200

SwXAutoStyle::GetPropertyValues_Impl: fix handling of CharAutoStyleName

Without this, all character properties defined inside automatic styles
are ignored.

Change-Id: I3c25f5d36503a9f40834dd88573a40c34380b967

diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 1be74cd..269c1ba 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4610,7 +4610,8 @@ uno::Sequence< uno::Any > 
SwXAutoStyle::GetPropertyValues_Impl(
 
 if ( RES_TXTATR_AUTOFMT == pEntry->nWID || RES_AUTO_STYLE == 
pEntry->nWID )
 {
-pValues[i] <<= StylePool::nameOf( mpSet );
+OUString sName(StylePool::nameOf( mpSet ));
+aTarget <<= sName;
 bDone = true;
 }
 else if(bTakeCareOfDrawingLayerFillStyle)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 sw/source/filter/ww8/ww8par.cxx |   12 
 1 file changed, 12 deletions(-)

New commits:
commit 982265ed2f896b56abaf94f8de065186ee74ac99
Author: Stephan Bergmann 
Date:   Mon Jun 30 13:55:22 2014 +0200

loplugin:unreffun

Change-Id: Ied75b7d6e9759a24dc857ff6f2adeee61f240e40

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 0513c26..b9c9771 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -5724,18 +5724,6 @@ sal_uLong SwWW8ImplReader::LoadThroughDecryption(SwPaM& 
rPaM ,WW8Glossary *pGlos
 return nErrRet;
 }
 
-class outlineeq : public std::unary_function
-{
-private:
-sal_uInt8 mnNum;
-public:
-outlineeq(sal_uInt8 nNum) : mnNum(nNum) {}
-bool operator()(const SwTxtFmtColl *pTest) const
-{
-return pTest->IsAssignedToListLevelOfOutlineStyle() && 
pTest->GetAssignedOutlineStyleLevel() == mnNum;
-}
-};
-
 void SwWW8ImplReader::SetOutlineStyles()
 {
 // If we are inserted into a document then don't clobber existing outline
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

deadline for 4.3.0 rc2 (and branch-off) today (2014-06-30)

[Christian Lohmaier]

Hi *,

a reminder that today is deadline for 4.3.0 rc2 / getting your fixes
in with only one review before the libreoffice-4-3-0 branch is
created.

https://wiki.documentfoundation.org/ReleasePlan/4.3#4.3.0_release

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

[Libreoffice-commits] core.git: extensions/CppunitTest_extensions_test_update.mk extensions/source

[Stephan Bergmann]

 extensions/CppunitTest_extensions_test_update.mk |5 -
 extensions/source/update/check/updatecheck.hxx   |4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit fd6d9b9dc3726841ea26bae487b46119265eb358
Author: Stephan Bergmann 
Date:   Mon Jun 30 14:16:50 2014 +0200

Allow CppunitTest_extensions_test_update direct access to UpdateCheck class

Change-Id: Ifa1dafe838e0e9c5bfa4525eaa744d4851551fc8

diff --git a/extensions/CppunitTest_extensions_test_update.mk 
b/extensions/CppunitTest_extensions_test_update.mk
index 80309ec..9ea0865 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -18,7 +18,6 @@ $(eval $(call 
gb_CppunitTest_add_exception_objects,extensions_test_update, \
 $(eval $(call 
gb_CppunitTest_use_external,extensions_test_update,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,extensions_test_update, \
-   updchk \
cppu \
cppuhelper \
sal \
@@ -27,6 +26,10 @@ $(eval $(call 
gb_CppunitTest_use_libraries,extensions_test_update, \
$(gb_UWINAPI) \
 ))
 
+$(eval $(call gb_CppunitTest_use_library_objects,extensions_test_update, \
+   updchk \
+))
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,extensions_test_update,\
shell32 \
diff --git a/extensions/source/update/check/updatecheck.hxx 
b/extensions/source/update/check/updatecheck.hxx
index ddf6179..ac971db 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -58,7 +58,7 @@ class UpdateCheck :
 public salhelper::ReferenceObject,
 public rtl::StaticWithInit< rtl::Reference< UpdateCheck >, 
UpdateCheckInitData >
 {
-SAL_DLLPUBLIC_EXPORT UpdateCheck();
+UpdateCheck();
 
 virtual ~UpdateCheck();
 
@@ -106,7 +106,7 @@ public:
 void cancelDownload();
 
 // Returns the XInteractionHandler of the UpdateHandler instance if 
present (and visible)
-SAL_DLLPUBLIC_EXPORT com::sun::star::uno::Reference< 
com::sun::star::task::XInteractionHandler > getInteractionHandler() const;
+com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler 
> getInteractionHandler() const;
 
 // UpdateCheckConfigListener
 virtual void autoCheckStatusChanged(bool enabled) SAL_OVERRIDE;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/inc/window.h |5 -
 vcl/source/window/window.cxx |   15 +++
 2 files changed, 15 insertions(+), 5 deletions(-)

New commits:
commit 0223eb2c6498a40a8d32575c9af189c570e490f6
Author: Stephan Bergmann 
Date:   Mon Jun 30 14:56:29 2014 +0200

Once ~SystemWindow calls ~Window, this is no longer a SystemWindow

...and hopefully it is just as fine to start this safety check at the paren,
anyway.

Change-Id: Ie3d7a1e233b9e3076a6603f2c6312d57b42b0f77

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 7fb93e2..4770d1a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -65,6 +65,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -327,13 +328,16 @@ Window::~Window()
 
Application::Abort(OStringToOUString(aTempStr.makeStringAndClear(), 
RTL_TEXTENCODING_UTF8));   // abort in debug builds, this must be fixed!
 }
 
-Window* pMyParent = this;
+Window* pMyParent = GetParent();
 SystemWindow* pMySysWin = NULL;
 
 while ( pMyParent )
 {
 if ( pMyParent->IsSystemWindow() )
-pMySysWin = (SystemWindow*)pMyParent;
+{
+pMySysWin = dynamic_cast(pMyParent);
+assert(pMyParent != 0);
+}
 pMyParent = pMyParent->GetParent();
 }
 if ( pMySysWin && pMySysWin->ImplIsInTaskPaneList( this ) )
@@ -349,13 +353,16 @@ Window::~Window()
 
 if( mpWindowImpl->mbIsInTaskPaneList )
 {
-Window* pMyParent = this;
+Window* pMyParent = GetParent();
 SystemWindow* pMySysWin = NULL;
 
 while ( pMyParent )
 {
 if ( pMyParent->IsSystemWindow() )
-pMySysWin = (SystemWindow*)pMyParent;
+{
+pMySysWin = dynamic_cast(pMyParent);
+assert(pMyParent != 0);
+}
 pMyParent = pMyParent->GetParent();
 }
 if ( pMySysWin && pMySysWin->ImplIsInTaskPaneList( this ) )
commit 5f50d9593d0754fc4c4c0655b14b27f5ad5635e4
Author: Stephan Bergmann 
Date:   Mon Jun 30 14:54:57 2014 +0200

Mark WindowImpl as noncopyable

Change-Id: I80f981216067a03578cfc812b006e6b68b77068e

diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index d8c864b..ccecb3d 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -20,6 +20,9 @@
 #ifndef INCLUDED_VCL_INC_WINDOW_H
 #define INCLUDED_VCL_INC_WINDOW_H
 
+#include 
+
+#include 
 #include 
 #include 
 #include 
@@ -192,7 +195,7 @@ struct ImplAccessibleInfos
 
 enum AlwaysInputMode { AlwaysInputNone = 0, AlwaysInputEnabled = 1, 
AlwaysInputDisabled =2 };
 
-class WindowImpl
+class WindowImpl: private boost::noncopyable
 {
 public:
 WindowImpl( WindowType );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-personas' - cui/source officecfg/registry

[Rachit Gupta]

 cui/source/options/personalization.cxx |   12 ++--
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |   12 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit c64c61ff06e27791e38f36fed7cda3d283ac5115
Author: Rachit Gupta 
Date:   Mon Jun 30 18:46:47 2014 +0530

Dropped 'Persona' from the properties in PersonasEntry template.

Change-Id: Ic662f59c084eacc7e99762c3e94fbcc191629557

diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index e78c779..0a431f0 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -376,7 +376,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 {
 Reference< XPropertySet > xPropertySet( 
officecfg::Office::Common::Misc::PersonasList::get()->getByName( 
installedPersonas[nIndex] ), UNO_QUERY_THROW );
 OUString aPersonaName, aPreviewFile, aHeaderFile, aFooterFile, 
aTextColor, aAccentColor, aPersonaSettings;
-Any aValue = xPropertySet->getPropertyValue( "PersonaPreview" );
+Any aValue = xPropertySet->getPropertyValue( "Preview" );
 aValue >>= aPreviewFile;
 INetURLObject aURLObj( aPreviewFile );
 aFilter.ImportGraphic( aGraphic, aURLObj );
@@ -384,19 +384,19 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 m_vExtensionPersonas[nCount]->Show();
 m_vExtensionPersonas[nCount++]->SetModeImage( Image( aBmp ) );
 
-aValue = xPropertySet->getPropertyValue( "PersonaName" );
+aValue = xPropertySet->getPropertyValue( "Name" );
 aValue >>= aPersonaName;
 
-aValue = xPropertySet->getPropertyValue( "PersonaHeader" );
+aValue = xPropertySet->getPropertyValue( "Header" );
 aValue >>= aHeaderFile;
 
-aValue = xPropertySet->getPropertyValue( "PersonaFooter" );
+aValue = xPropertySet->getPropertyValue( "Footer" );
 aValue >>= aFooterFile;
 
-aValue = xPropertySet->getPropertyValue( "PersonaTextColor" );
+aValue = xPropertySet->getPropertyValue( "TextColor" );
 aValue >>= aTextColor;
 
-aValue = xPropertySet->getPropertyValue( "PersonaAccentColor" );
+aValue = xPropertySet->getPropertyValue( "AccentColor" );
 aValue >>= aAccentColor;
 
 aPersonaSettings = aHeaderFile + ";" + aFooterFile + ";" + aTextColor 
+ ";" + aAccentColor;
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 6548445..408874f 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -810,35 +810,35 @@
   
 Stores the details of the installed personas.
   
-  
+  
 
   The Persona's name
 
   
-  
+  
 
   Name of the preview file for the Persona to show in the 
UI
 
   
-  
+  
 
   Name of the header file for the Persona
 
 
   
-  
+  
 
   Name of the footer file for the Persona
 
 
   
-  
+  
 
   Value of the text color for the Persona
 
 
   
-  
+  
 
   Value of the accent color for the Persona
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/core/unocore/unostyle.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit e54b03eeca407486d29f5fc0292dc3743ef09751
Author: Miklos Vajna 
Date:   Mon Jun 30 15:22:03 2014 +0200

SwXPageStyle::GetPropertyValues_Impl: lost FN_UNO_HEADER/FOOTER_FIRST

Change-Id: I38d7372f713c115b7c975e2aad84ae14e3cf8e1f

diff --git a/sw/source/core/unocore/unostyle.cxx 
b/sw/source/core/unocore/unostyle.cxx
index 269c1ba..b8dbd32 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -3820,9 +3820,11 @@ uno::Sequence< uno::Any > SAL_CALL 
SwXPageStyle::GetPropertyValues_Impl(
 
 case FN_UNO_HEADER:
 case FN_UNO_HEADER_LEFT:
+case FN_UNO_HEADER_FIRST:
 case FN_UNO_HEADER_RIGHT:
 case FN_UNO_FOOTER:
 case FN_UNO_FOOTER_LEFT:
+case FN_UNO_FOOTER_FIRST:
 case FN_UNO_FOOTER_RIGHT:
 {
 // cleanups for readability (undos removed, rearranged)
@@ -3832,9 +3834,11 @@ uno::Sequence< uno::Any > SAL_CALL 
SwXPageStyle::GetPropertyValues_Impl(
 {
 case FN_UNO_HEADER:   bHeader = true;  nRes = 
RES_HEADER; break;
 case FN_UNO_HEADER_LEFT:  bHeader = true;  nRes = 
RES_HEADER; bLeft = true;  break;
+case FN_UNO_HEADER_FIRST: bHeader = true;  nRes = 
RES_HEADER; bFirst = true; break;
 case FN_UNO_HEADER_RIGHT: bHeader = true;  nRes = 
RES_HEADER; break;
 case FN_UNO_FOOTER:   bHeader = false; nRes = 
RES_FOOTER; break;
 case FN_UNO_FOOTER_LEFT:  bHeader = false; nRes = 
RES_FOOTER; bLeft = true;  break;
+case FN_UNO_FOOTER_FIRST: bHeader = false; nRes = 
RES_FOOTER; bFirst = true; break;
 case FN_UNO_FOOTER_RIGHT: bHeader = false; nRes = 
RES_FOOTER; break;
 default: break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - editeng/source

[matteocam]

 editeng/source/editeng/impedit3.cxx |   16 ++--
 1 file changed, 2 insertions(+), 14 deletions(-)

New commits:
commit f839ca859194d0850e33685d7f59d9c75b5e003a
Author: matteocam 
Date:   Mon Jun 30 09:29:34 2014 -0400

Resumed nDiff and CheckAutoPageSize: they were not effective

Change-Id: I599e7b21dc61a09f9cc3f68533183552caaac0ae

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 94a1b67..e220750 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -436,9 +436,8 @@ void ImpEditEngine::FormatDoc()
 {
 sal_uInt32 nNewHeightNTP;
 sal_uInt32 nNewHeight = CalcTextHeight( &nNewHeightNTP );
-// FIXME(matteocam)
-long nDiff = 0;
-//long nDiff = nNewHeight - nCurTextHeight;
+
+long nDiff = nNewHeight - nCurTextHeight;
 if ( nDiff )
 aStatus.GetStatusWord() |= !IsVertical() ? 
EE_STAT_TEXTHEIGHTCHANGED : EE_STAT_TEXTWIDTHCHANGED;
 if ( nNewHeight < nCurTextHeight )
@@ -518,11 +517,6 @@ bool ImpEditEngine::ImpCheckRefMapMode()
 
 void ImpEditEngine::CheckAutoPageSize()
 {
-// FIXME(matteocam)
-SetValidPaperSize( aPaperSize );// consider Min, Max
-return;
-// END FIXME
-
 Size aPrevPaperSize( GetPaperSize() );
 
 if ( GetStatus().AutoPageWidth() )
@@ -3430,12 +3424,6 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, 
Rectangle aClipRect, Point aSt
  ' ' == aText[nTextStart + 
nTextLen - 1] )
 --nTextLen;
 
-// FIXME(matteocam)
-if (aTmpFont.GetItalic() != 
ITALIC_NONE) {
-Color aColor = COL_BROWN;
-aTmpFont.SetFillColor(aColor);
-}
-
 // output directly
 aTmpFont.QuickDrawText( pOutDev, 
aRealOutPos, aText, nTextStart, nTextLen, pDXArray );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - include/vcl solenv/gbuild vcl/source

[Norbert Thiebaud]

 include/vcl/settings.hxx |1 +
 solenv/gbuild/platform/macosx.mk |3 +++
 vcl/source/app/settings.cxx  |9 +
 vcl/source/window/window.cxx |7 +--
 4 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 752a36457f6cddc5265a2d5f60157fd625f56b02
Author: Norbert Thiebaud 
Date:   Sun Jun 29 23:42:32 2014 +0200

use VCL_HIDE_WINDOWS env on Mac to 'simulate' headless mode on Mac

Building, and running the unit/subsequent test on Mac cause massive amount
of flashing windows creation/destruction that make building with test
very annoying on a box used for other purposes.
This patch prevent the windows to be actually displayed hence mitigating
the problem

Signed-off-by: Michael Meeks 

Conflicts:
vcl/source/window/window.cxx

Change-Id: Ied2a36699b50856e0c4e6b618212481796ec99d3

diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx
index 0a6c6e9..021161f 100644
--- a/include/vcl/settings.hxx
+++ b/include/vcl/settings.hxx
@@ -588,6 +588,7 @@ public:
 boolGetDisablePrinting() const;
 voidSetEnableLocalizedDecimalSep( bool bEnable 
);
 boolGetEnableLocalizedDecimalSep() const;
+boolGetPseudoHeadless() const;
 
 booloperator ==( const MiscSettings& rSet ) 
const;
 booloperator !=( const MiscSettings& rSet ) 
const;
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 8d6f834..a40e054 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -17,6 +17,9 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
+# to avoid flashing windows during tests
+export VCL_HIDE_WINDOWS=1
+
 gb_SDKDIR := $(MACOSX_SDK_PATH)
 
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 4174d5a..97b05d0 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -213,6 +213,7 @@ struct ImplMiscData
 TriStatemnEnableATT;
 boolmbEnableLocalizedDecimalSep;
 TriStatemnDisablePrinting;
+boolmbPseudoHeadless;
 };
 
 struct ImplHelpData
@@ -2341,6 +2342,8 @@ ImplMiscData::ImplMiscData()
 mnDisablePrinting   = TRISTATE_INDET;
 static const char* pEnv = getenv("SAL_DECIMALSEP_ENABLED" ); // set 
default without UI
 mbEnableLocalizedDecimalSep = (pEnv != NULL);
+pEnv = getenv("VCL_HIDE_WINDOWS"); // do not display any windows
+mbPseudoHeadless = (pEnv != NULL);
 }
 
 ImplMiscData::ImplMiscData( const ImplMiscData& rData )
@@ -2348,6 +2351,7 @@ ImplMiscData::ImplMiscData( const ImplMiscData& rData )
 mnEnableATT = rData.mnEnableATT;
 mnDisablePrinting   = rData.mnDisablePrinting;
 mbEnableLocalizedDecimalSep = rData.mbEnableLocalizedDecimalSep;
+mbPseudoHeadless = rData.mbPseudoHeadless;
 }
 
 MiscSettings::MiscSettings()
@@ -2535,6 +2539,11 @@ bool MiscSettings::GetEnableLocalizedDecimalSep() const
 return mpData->mbEnableLocalizedDecimalSep;
 }
 
+bool MiscSettings::GetPseudoHeadless() const
+{
+return mpData->mbPseudoHeadless;
+}
+
 ImplHelpData::ImplHelpData()
 {
 mnTipDelay  = 500;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index b77447c..fff59e5 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -5259,8 +5259,11 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
 mpWindowImpl->mbSuppressAccessibilityEvents = false;
 
 mpWindowImpl->mbPaintFrame = true;
-bool bNoActivate = (nFlags & (SHOW_NOACTIVATE|SHOW_NOFOCUSCHANGE)) 
? sal_True : sal_False;
-mpWindowImpl->mpFrame->Show( true, bNoActivate );
+if 
(!Application::GetSettings().GetMiscSettings().GetPseudoHeadless())
+{
+bool bNoActivate = (nFlags & 
(SHOW_NOACTIVATE|SHOW_NOFOCUSCHANGE)) ? true : false;
+mpWindowImpl->mpFrame->Show( true, bNoActivate );
+}
 if( aDogTag.IsDead() )
 return;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst

[Andrea Pescetti]

 extensions.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7aea08c86d2ca1f2c97ca191d5530a2b01acd8c
Author: Andrea Pescetti 
Date:   Mon Jun 30 12:07:13 2014 +

#i125182# Update English dictionaries.

diff --git a/extensions.lst b/extensions.lst
index 6c6b680..f6a91c8 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -39,7 +39,7 @@
 
 # English dictionary
 [ language=en.* || language=de || language=it ]
-21000528c50707539220e05df554172f 
http://sourceforge.net/projects/aoo-extensions/files/17102/3/dict-en.oxt/download
 "dict-en.oxt"
+6e6d2112a43b744fa5dc12c4b150d52a 
http://sourceforge.net/projects/aoo-extensions/files/17102/5/dict-en.oxt/download
 "dict-en.oxt"
 
 # English (USA, en_US) dictionary
 [ language==nl || language==ru ]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/CppunitTest_extensions_test_update.mk

[Michael Stahl]

 extensions/CppunitTest_extensions_test_update.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 83d00917f2eb949d0b76851d46479361173fdd75
Author: Michael Stahl 
Date:   Mon Jun 30 16:13:39 2014 +0200

extensions: MSVC tinderbox wants its InternetGetConnectedStateEx

Change-Id: Ie5486e910ba562954ef38c83b2fa673511a9e931

diff --git a/extensions/CppunitTest_extensions_test_update.mk 
b/extensions/CppunitTest_extensions_test_update.mk
index 9ea0865..3fb72f3 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -34,6 +34,7 @@ ifeq ($(OS),WNT)
 $(eval $(call gb_CppunitTest_use_system_win32_libs,extensions_test_update,\
shell32 \
ole32 \
+   wininet \
 ))
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libgltf

[Zolnai Tamás]

 external/libgltf/UnpackedTarball_libgltf.mk|2 
 external/libgltf/patches/comma_at_end_of_enumerator_list.patch |   51 
++
 external/libgltf/patches/extra_semicolon.patch |   18 +++
 3 files changed, 71 insertions(+)

New commits:
commit 384f9ef47b18dba56c5bf88d5d7aa8340321a380
Author: Zolnai Tamás 
Date:   Sat Jun 28 12:35:25 2014 +0200

libgltf: fix Linux-with-check build

It seems some of the warnings are treated as errors
in Linux-with-check builds.

Change-Id: I9ed876ba634d944c022838a625164f06f100a7df
(cherry picked from commit a2648efa6748b782bf739c55cf93fb69d547ead1)
Reviewed-on: https://gerrit.libreoffice.org/9980
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 174e719..2e027ad 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -30,6 +30,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/move_fps_closer_to_the_corner.patch \
external/libgltf/patches/compiler_error_fixes.patch \
external/libgltf/patches/fix_package_file.patch \
+   external/libgltf/patches/comma_at_end_of_enumerator_list.patch \
+   external/libgltf/patches/extra_semicolon.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/comma_at_end_of_enumerator_list.patch 
b/external/libgltf/patches/comma_at_end_of_enumerator_list.patch
new file mode 100644
index 000..7e336f7
--- /dev/null
+++ b/external/libgltf/patches/comma_at_end_of_enumerator_list.patch
@@ -0,0 +1,51 @@
+diff -ur libgltf.org/src/Common.h libgltf/src/Common.h
+--- libgltf.org/src/Common.h   2014-06-28 12:17:56.880068394 +0200
 libgltf/src/Common.h   2014-06-28 12:22:32.940078647 +0200
+@@ -86,7 +86,7 @@
+ DataType_FLOAT_MAT3 = 0x8B5B,
+ DataType_FLOAT_MAT4 = 0x8B5C,
+ DataType_SAMPLER_2D = 0x8B5E,
+-DataType_SAMPLER_CUBE   = 0x8B60,
++DataType_SAMPLER_CUBE   = 0x8B60
+ } DataType_E;
+ 
+ class Attribute
+@@ -119,7 +119,7 @@
+ LightSource_DIRECTIONAL   = 0x1,
+ LightSource_POINT = 0x2,
+ LightSource_SPOT  = 0x3,
+-LightSource_AMBIET= 0x4,
++LightSource_AMBIET= 0x4
+ } LightSourceType_E;
+ 
+ class Light
+@@ -252,7 +252,7 @@
+ TextureType_DISPLACEMENT = 0x9,
+ TextureType_LIGHTMAP = 0xA,
+ TextureType_REFLECTION = 0xB,
+-TextureType_UNKNOWN = 0xC,
++TextureType_UNKNOWN = 0xC
+ } TextureType_E;
+ 
+ class MaterialProperty
+@@ -449,7 +449,7 @@
+ NodeType_Node= 0x1,
+ NodeType_Mesh= 0x2,
+ NodeType_Camera  = 0x4,
+-NodeType_Light   = 0x8,
++NodeType_Light   = 0x8
+ } NodeType_E;
+ 
+ class Node
+diff -ur libgltf.org/src/Texture.h libgltf/src/Texture.h
+--- libgltf.org/src/Texture.h  2014-06-28 12:17:56.880068394 +0200
 libgltf/src/Texture.h  2014-06-28 12:18:19.740069243 +0200
+@@ -24,7 +24,7 @@
+ TEXTURE_FILTER_MIN_BILINEAR,
+ TEXTURE_FILTER_MIN_NEAREST_MIPMAP,
+ TEXTURE_FILTER_MIN_BILINEAR_MIPMAP,
+-TEXTURE_FILTER_MIN_TRILINEAR,
++TEXTURE_FILTER_MIN_TRILINEAR
+ };
+ 
+ class Texture
diff --git a/external/libgltf/patches/extra_semicolon.patch 
b/external/libgltf/patches/extra_semicolon.patch
new file mode 100644
index 000..42602d6
--- /dev/null
+++ b/external/libgltf/patches/extra_semicolon.patch
@@ -0,0 +1,18 @@
+diff -ur libgltf.org/src/Common.cpp libgltf/src/Common.cpp
+--- libgltf.org/src/Common.cpp 2014-06-28 12:30:58.792097436 +0200
 libgltf/src/Common.cpp 2014-06-28 12:31:13.884097997 +0200
+@@ -550,12 +550,12 @@
+ /* -- Primitives -- */
+ Primitives::Primitives()
+ {
+-};
++}
+ 
+ Primitives::~Primitives()
+ {
+ mAttributeMap.clear();
+-};
++}
+ 
+ void Primitives::setMaterialIndex(std::string materialIndex)
+ {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Sort and copy results

[Kevin André]

On Fri, Jun 6, 2014 at 1:42 PM, Wols Lists  wrote:
>
> That's one of my moans (maybe it's been fixed) about LO spellcheck! It's
> too long ago to remember the details, and it was in a cell (can't
> remember whether it was a Writer table or Calc). Anyways, I filled the
> cell and tabbed away. The AutoCorrupt kicked in. And  reversed
> the ENTIRE operation, deleting the text I'd typed! I just *could* *not*
> work out how to get LO to accept what I'd typed without insisting on
> corrupting it.
>
> So it makes a lot of sense, in many circumstances, for a user's input to
> be treated as multiple steps requiring multiple undos, even when it's
> just one user action that triggers it.

This.
Please check out bug #36867 which I filed 3 years ago and still isn't fixed.


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

[Libreoffice-commits] core.git: 3 commits - configmgr/source sw/inc sw/source writerfilter/source

[Michael Meeks]

 configmgr/source/access.hxx   |9 +-
 configmgr/source/components.hxx   |3 
 configmgr/source/config_map.hxx   |   35 
 configmgr/source/data.hxx |4 
 configmgr/source/nodemap.hxx  |4 
 sw/inc/docstyle.hxx   |   26 +++---
 sw/source/uibase/app/docstyle.cxx |   60 +++---
 writerfilter/source/ooxml/OOXMLFactory.cxx|   74 +-
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |2 
 writerfilter/source/ooxml/OOXMLPropertySetImpl.cxx|   37 -
 writerfilter/source/ooxml/OOXMLPropertySetImpl.hxx|7 -
 11 files changed, 150 insertions(+), 111 deletions(-)

New commits:
commit 4771c8836a3e4d5e8ac25a7212293a13fb1e73ba
Author: Michael Meeks 
Date:   Sat Jun 28 22:59:33 2014 +0100

writerfilter: use XFastAttributes more efficiently.

Don't duplicate UTF8 as UCS2 before converting to integers.
Don't double convert every attribute, and allocate it twice.

Change-Id: Ibb15d703f011865dac8eb72f18408a5d62b60d96

diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx 
b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 597631b..c45b4f5 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include "OOXMLFactory.hxx"
 #include "OOXMLFastHelper.hxx"
 
@@ -131,59 +132,61 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * 
pHandler,
 AttributeToResourceMap::const_iterator aIt;
 AttributeToResourceMap::const_iterator aEndIt = pMap->end();
 
+assert( dynamic_cast< sax_fastparser::FastAttributeList *>( 
Attribs.get() ) != NULL );
+sax_fastparser::FastAttributeList *pAttribs;
+pAttribs = static_cast< sax_fastparser::FastAttributeList *>( 
Attribs.get() );
+
 for (aIt = pMap->begin(); aIt != aEndIt; ++aIt)
 {
-Id nId = (*pTokenToIdMap)[aIt->first];
-if (Attribs->hasAttribute(aIt->first))
+sal_Int32 nToken = aIt->first;
+if (pAttribs->hasAttribute(nToken))
 {
+Id nId = (*pTokenToIdMap)[nToken];
+
 switch (aIt->second.m_nResource)
 {
 case RT_Boolean:
 {
-OUString aValue(Attribs->getValue(aIt->first));
-
OOXMLFastHelper::newProperty(pHandler, nId, aValue);
-
-OOXMLValue::Pointer_t pValue(new 
OOXMLBooleanValue(aValue));
-pFactory->attributeAction(pHandler, aIt->first, 
pValue);
+const char *pValue = "";
+pAttribs->getAsChar(nToken, pValue);
+OOXMLValue::Pointer_t xValue(new 
OOXMLBooleanValue(pValue));
+pHandler->newProperty(nId, xValue);
+pFactory->attributeAction(pHandler, nToken, xValue);
 }
 break;
 case RT_String:
 {
-OUString aValue(Attribs->getValue(aIt->first));
-OOXMLFastHelper::newProperty
-(pHandler, nId, aValue);
-
-OOXMLValue::Pointer_t pValue(new 
OOXMLStringValue(aValue));
-pFactory->attributeAction(pHandler, aIt->first, 
pValue);
+OUString aValue(pAttribs->getValue(nToken));
+OOXMLValue::Pointer_t xValue(new 
OOXMLStringValue(aValue));
+pHandler->newProperty(nId, xValue);
+pFactory->attributeAction(pHandler, nToken, xValue);
 }
 break;
 case RT_Integer:
 {
-OUString aValue(Attribs->getValue(aIt->first));
-OOXMLFastHelper::newProperty
-(pHandler, nId, aValue);
-
-OOXMLValue::Pointer_t pValue(new 
OOXMLIntegerValue(aValue));
-pFactory->attributeAction(pHandler, aIt->first, 
pValue);
+sal_Int32 nValue;
+pAttribs->getAsInteger(nToken,nValue);
+OOXMLValue::Pointer_t xValue(new 
OOXMLIntegerValue(nValue));
+pHandler->newProperty(nId, xValue);
+pFactory->attributeAction(pHandler, nToken, xValue);
 }
 break;
 case RT_Hex:
 {
-OUString aValue(Attribs->getValue(aIt->first));
-OOXMLFastHelper::newProperty
-(pHandler, nId, aValue);
-
-OOXMLValue::Pointer_t pValue(ne

Re: Sort and copy results

[Kohei Yoshida]

On Mon, 2014-06-30 at 16:34 +0200, Kevin André wrote:
> On Fri, Jun 6, 2014 at 1:42 PM, Wols Lists  wrote:
> >
> > That's one of my moans (maybe it's been fixed) about LO spellcheck! It's
> > too long ago to remember the details, and it was in a cell (can't
> > remember whether it was a Writer table or Calc). Anyways, I filled the
> > cell and tabbed away. The AutoCorrupt kicked in. And  reversed
> > the ENTIRE operation, deleting the text I'd typed! I just *could* *not*
> > work out how to get LO to accept what I'd typed without insisting on
> > corrupting it.
> >
> > So it makes a lot of sense, in many circumstances, for a user's input to
> > be treated as multiple steps requiring multiple undos, even when it's
> > just one user action that triggers it.
> 
> This.
> Please check out bug #36867 which I filed 3 years ago and still isn't fixed.

Just so you know, piggybacking on a thread and say "please fix my
favorite bug I filed x years ago" is not appreciated.

As always, patches are welcome.

Kohei

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

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

[Stephan Bergmann]

 include/vcl/outdev.hxx   |9 ++---
 include/vcl/syswin.hxx   |7 ---
 include/vcl/window.hxx   |8 
 vcl/source/window/window.cxx |2 --
 4 files changed, 2 insertions(+), 24 deletions(-)

New commits:
commit 8a0df1b7e50ee4e39be0242ca245627b4eedd7e5
Author: Stephan Bergmann 
Date:   Mon Jun 30 16:42:28 2014 +0200

Clean up OutputDevice and derived classes noncopyable-ness

Change-Id: Id29e52c94a89cac20e29ae0a1f0b9f90ffdfcf09

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index cefffe2..199ca08 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -42,6 +42,7 @@
 
 #include 
 
+#include 
 #include 
 #ifdef check
 #  //some problem with MacOSX and a check define
@@ -244,7 +245,7 @@ extern const sal_uLong nVCLBLut[ 6 ];
 extern const sal_uLong nVCLDitherLut[ 256 ];
 extern const sal_uLong nVCLLut[ 256 ];
 
-class VCL_DLLPUBLIC OutputDevice
+class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable
 {
 friend class Application;
 friend class Bitmap;
@@ -350,15 +351,9 @@ private:
 protected:
 OutputDevice();
 
-private:
-SAL_DLLPRIVATE  OutputDevice( const OutputDevice& rOutDev );
-
 public:
 virtual ~OutputDevice();
 
-private:
-SAL_DLLPRIVATE OutputDevice& operator =( const OutputDevice& rOutDev );
-
 public:
 
 /** Get the graphic context that the output device uses to draw on.
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 098f49e..f5a1eca 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -158,13 +158,6 @@ public:
 SAL_DLLPRIVATE bool ImplIsInTaskPaneList( Window* pWin );
 
 private:
-// Default construction is forbidden and not implemented.
-SystemWindow();
-
-// Copy assignment is forbidden and not implemented.
-SystemWindow (const SystemWindow &);
-SystemWindow & operator= (const SystemWindow &);
-
 SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long 
i_nWidth, long i_nHeight, Window* i_pConfigureWin );
 
 protected:
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index ddf010d..3cf10320 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -619,14 +619,6 @@ private:
 public:
 virtual Region  GetActiveClipRegion() const 
SAL_OVERRIDE;
 
-private:
-// Default construction is forbidden and not implemented.
-SAL_DLLPRIVATE  Window();
-
-// Copy assignment is forbidden and not implemented.
-SAL_DLLPRIVATE  Window (const Window &);
-SAL_DLLPRIVATE  Window & operator= (const Window &);
-
 protected:
 // Single argument ctors shall be explicit.
 explicitWindow( WindowType nType );
commit f8e34ea78a3159b3bf717353a3fc7d62e7fecd57
Author: Stephan Bergmann 
Date:   Mon Jun 30 16:38:35 2014 +0200

...and ~SystemWindow can recursively destroy its child windows

...so when the pMyParent vs. pMySysWin typos in the asserts (thanks Matteo 
and
Micheal for spotting) were fixed, they would fire in such scenarios.  So 
just
hope that it is fine to effectively skip those safety checks in these cases,
too.

Change-Id: Ib925e57b68643c75a5d4db67fd64692015482179

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 4770d1a..af060f2 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -336,7 +336,6 @@ Window::~Window()
 if ( pMyParent->IsSystemWindow() )
 {
 pMySysWin = dynamic_cast(pMyParent);
-assert(pMyParent != 0);
 }
 pMyParent = pMyParent->GetParent();
 }
@@ -361,7 +360,6 @@ Window::~Window()
 if ( pMyParent->IsSystemWindow() )
 {
 pMySysWin = dynamic_cast(pMyParent);
-assert(pMyParent != 0);
 }
 pMyParent = pMyParent->GetParent();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/kohei/sort-ref-update' - sc/inc sc/qa sc/source

[Kohei Yoshida]

 sc/inc/document.hxx  |   17 +
 sc/qa/unit/filters-test.cxx  |1 +
 sc/qa/unit/ucalc.cxx |1 +
 sc/source/core/data/documen3.cxx |   10 ++
 sc/source/filter/xml/XMLExportDatabaseRanges.cxx |1 +
 sc/source/filter/xml/xmldrani.cxx|1 +
 sc/source/ui/undo/undobase.cxx   |1 +
 sc/source/ui/unoobj/cellsuno.cxx |1 +
 sc/source/ui/unoobj/datauno.cxx  |1 +
 9 files changed, 22 insertions(+), 12 deletions(-)

New commits:
commit d55bcb839bc4e6e6e1ba703ac1e6185e74dacb38
Author: Kohei Yoshida 
Date:   Mon Jun 30 10:43:49 2014 -0400

Let's not include sortparam.hxx in document.hxx.

Change-Id: Ie2179c64909845163398b1f0592e1c88151afe8e

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index fef0683..ca2f4ea 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -29,7 +29,6 @@
 #include "rangenam.hxx"
 #include "brdcst.hxx"
 #include "tabopparams.hxx"
-#include "sortparam.hxx"
 #include "types.hxx"
 #include 
 #include 
@@ -80,6 +79,7 @@ class RowHeightContext;
 struct SetFormulaDirtyContext;
 class RefMovedHint;
 struct SortUndoParam;
+struct ReorderParam;
 
 }
 
@@ -182,6 +182,8 @@ class EditTextObject;
 struct ScRefCellValue;
 class ScDocumentImport;
 class ScPostIt;
+struct ScSubTotalParam;
+struct ScQueryParam;
 
 namespace com { namespace sun { namespace star {
 namespace lang {
@@ -2035,8 +2037,8 @@ public:
 
 voidInvalidateStyleSheetUsage()
 { bStyleSheetUsageInvalid = true; }
-void GetSortParam( ScSortParam& rParam, SCTAB nTab );
-void SetSortParam( ScSortParam& rParam, SCTAB nTab );
+void SC_DLLPUBLIC GetSortParam( ScSortParam& rParam, SCTAB nTab );
+void SC_DLLPUBLIC SetSortParam( ScSortParam& rParam, SCTAB nTab );
 
 inline void SetVbaEventProcessor( const 
com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor 
>& rxVbaEvents )
 { mxVbaEvents = rxVbaEvents; }
@@ -2163,15 +2165,6 @@ private:
 
 void SharePooledResources( ScDocument* pSrcDoc );
 };
-inline void ScDocument::GetSortParam( ScSortParam& rParam, SCTAB nTab )
-{
-rParam = mSheetSortParams[ nTab ];
-}
-
-inline void ScDocument::SetSortParam( ScSortParam& rParam, SCTAB nTab )
-{
-mSheetSortParams[ nTab ] = rParam;
-}
 
 #endif
 
diff --git a/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index bb60b7b..da9ec56 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index b852010..7b41d41 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -63,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 1486092..90ada8c 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -2012,4 +2012,14 @@ bool ScDocument::ReservePatternCount( SCTAB nTab, SCCOL 
nCol, SCSIZE nReserve )
 return false;
 }
 
+void ScDocument::GetSortParam( ScSortParam& rParam, SCTAB nTab )
+{
+rParam = mSheetSortParams[ nTab ];
+}
+
+void ScDocument::SetSortParam( ScSortParam& rParam, SCTAB nTab )
+{
+mSheetSortParams[ nTab ] = rParam;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx 
b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index a507427..758a1f9 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -35,6 +35,7 @@
 #include "subtotalparam.hxx"
 #include "queryparam.hxx"
 #include "queryentry.hxx"
+#include 
 
 #include 
 
diff --git a/sc/source/filter/xml/xmldrani.cxx 
b/sc/source/filter/xml/xmldrani.cxx
index 9088e00..38db1b30 100644
--- a/sc/source/filter/xml/xmldrani.cxx
+++ b/sc/source/filter/xml/xmldrani.cxx
@@ -34,6 +34,7 @@
 #include "rangeutl.hxx"
 #include "queryentry.hxx"
 #include "dputil.hxx"
+#include 
 
 #include 
 #include 
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index 8740c6b..dc7efd4 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -33,6 +33,7 @@
 #include "globstr.hrc"
 #include 
 #include 
+#include 
 
 TYPEINIT1(ScSimpleUndo, SfxUndoAction);
 TYPEINIT1(ScBlockUndo,  ScSimpleUndo);
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 3a94df0..7ad0202 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -125,6 +125,7 @@
 #include "tokenarray.hxx"
 #include "stylehelper.hxx"
 #include "dputil.hxx"
+#include 
 
 #include 
 #include 
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx

Code location / class names for Change Object Connector control points

[Rob Collins]

N.B. This is a follow-up to my previous question on where to find edge  
(connector) code - which was successfully answered - so thank you for  
that!


I am now looking for the code that implements the 'control points' on  
connecting lines. That is, when drawing an edge between two nodes the  
edge (connector) can be dragged into a new path using 'control points'  
that appear on each line segment.


As previously - where is the code for this? What symbols / classes /  
filenames should I be searching for?


Rob


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

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

[Vinaya Mandke]

 sw/qa/core/data/ooxml/pass/fdo80514.docx  |binary
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 ++
 writerfilter/source/dmapper/NumberingManager.cxx  |5 +
 writerfilter/source/dmapper/NumberingManager.hxx  |3 +++
 4 files changed, 14 insertions(+)

New commits:
commit b00a59287e0b1dcc0a46dd18e5e884282eb859f3
Author: Vinaya Mandke 
Date:   Wed Jun 25 12:53:07 2014 +0530

fdo#80514 LO crashes on opening; tries to remove a para with NumPicBullet

LO crashes while opening the issue file as, an extra Num Pic Bullets is
attached to the dummy para. All NumPicBullets were disposed in
dtor of ListsManager.
LO tries to remove dummy para after the section, while the pic bullet is 
still attached to it.
This causes Lo to crash while removing the paragraph.

Added a 'ListsManager::DisposeNumPicBullets( )' to remove the extra bullets 
from the document
Added the issue file in sw/qa/core/data/ooxml/pass/

Change-Id: I578f48364dcb4ff939fa3800e90db88a99d5ca1a
Reviewed-on: https://gerrit.libreoffice.org/9897
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/qa/core/data/ooxml/pass/fdo80514.docx 
b/sw/qa/core/data/ooxml/pass/fdo80514.docx
new file mode 100644
index 000..5ea2ce7
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo80514.docx differ
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 20fcbfc..8bd5900 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -299,6 +299,12 @@ void DomainMapper_Impl::RemoveDummyParaForTableInSection()
 return;
 uno::Reference< text::XTextCursor > xCursor = 
GetTopTextAppend()->createTextCursorByRange(pSectionContext->GetStartingRange());
 
+// Remove the extra NumPicBullets from the document,
+// which get attached to the first paragraph in the
+// document
+ListsManager::Pointer pListTable = GetListTable();
+pListTable->DisposeNumPicBullets();
+
 uno::Reference xEnumerationAccess(xCursor, 
uno::UNO_QUERY);
 if (xEnumerationAccess.is() && m_aTextAppendStack.size() == 1 )
 {
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx 
b/writerfilter/source/dmapper/NumberingManager.cxx
index 000eb72..d34c0b9 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -699,6 +699,11 @@ ListsManager::ListsManager(DomainMapper& rDMapper,
 
 ListsManager::~ListsManager( )
 {
+DisposeNumPicBullets();
+}
+
+void ListsManager::DisposeNumPicBullets( )
+{
 uno::Reference xShape;
 for (std::vector::iterator it = 
m_aNumPicBullets.begin(); it != m_aNumPicBullets.end(); ++it)
 {
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx 
b/writerfilter/source/dmapper/NumberingManager.hxx
index 3845d40..3eff441 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -263,6 +263,9 @@ public:
 
 // Mapping methods
 void CreateNumberingRules( );
+
+// Dispose the NumPicBullets
+void DisposeNumPicBullets( );
 };
 
 } }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/calc-data-table' - sc/inc sc/source

[Markus Mohrhard]

 sc/inc/dbdata.hxx  |5 +++
 sc/source/core/tool/dbdata.cxx |   38 +
 sc/source/filter/oox/datatablebuffer.cxx   |   11 
 sc/source/filter/oox/datatablebuffer.hxx   |1 
 sc/source/filter/oox/worksheetfragment.cxx |9 ++
 5 files changed, 64 insertions(+)

New commits:
commit 5e0ec00b02cc95341ef3c08f10aab4d9e46a9923
Author: Markus Mohrhard 
Date:   Mon Jun 30 17:07:47 2014 +0200

set the data table info to the model

Change-Id: I11c941ada1a5b9f23bfed2604f2a4f495e795b29

diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index bb2684a..87a9580 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -34,6 +34,7 @@ struct ScSortParam;
 struct ScQueryParam;
 struct ScSubTotalParam;
 struct ScImportParam;
+struct ScTableData;
 
 class ScDBData : public ScRefreshTimer
 {
@@ -42,6 +43,7 @@ private:
 boost::scoped_ptr mpQueryParam;
 boost::scoped_ptr mpSubTotal;
 boost::scoped_ptr mpImportParam;
+boost::scoped_ptr mpTableData;
 
 /// DBParam
 const OUString aName;
@@ -79,6 +81,7 @@ public:
  SCTAB nTab,
  SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
  bool bByR = true, bool bHasH = true);
+SC_DLLPUBLIC ScDBData(const OUString& rName, const ScRange& rRange);
 ScDBData(const ScDBData& rData);
 ScDBData(const OUString& rName, const ScDBData& rData);
 virtual ~ScDBData();
@@ -116,6 +119,8 @@ public:
 SC_DLLPUBLIC void   SetQueryParam(const ScQueryParam& rQueryParam);
 SC_DLLPUBLIC bool   GetAdvancedQuerySource(ScRange& rSource) const;
 SC_DLLPUBLIC void   SetAdvancedQuerySource(const ScRange* pSource);
+SC_DLLPUBLIC void   SetTableData(const ScTableData& rData);
+SC_DLLPUBLIC void   GetTableData(ScTableData& rData);
 
 voidGetSubTotalParam(ScSubTotalParam& rSubTotalParam) const;
 voidSetSubTotalParam(const ScSubTotalParam& rSubTotalParam);
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index c5ba011..3573bf3 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -29,6 +29,7 @@
 #include "globstr.hrc"
 #include "subtotalparam.hxx"
 #include "sortparam.hxx"
+#include "tabledata.hxx"
 
 #include 
 
@@ -44,6 +45,33 @@ bool ScDBData::less::operator() (const ScDBData& left, const 
ScDBData& right) co
 return ScGlobal::GetpTransliteration()->compareString(left.GetUpperName(), 
right.GetUpperName()) < 0;
 }
 
+ScDBData::ScDBData(const OUString& rName, const ScRange& rRange):
+mpSortParam(new ScSortParam),
+mpQueryParam(new ScQueryParam),
+mpSubTotal(new ScSubTotalParam),
+mpImportParam(new ScImportParam),
+mpTableData(new ScTableData),
+aName   (rName),
+aUpper  (rName),
+nTable  (rRange.aStart.Tab()),
+nStartCol   (rRange.aStart.Col()),
+nStartRow   (rRange.aStart.Row()),
+nEndCol (rRange.aEnd.Col()),
+nEndRow (rRange.aEnd.Row()),
+bByRow  (false), // TODO: moggi: fix it
+bHasHeader  (false), // TODO: moggi: fix it
+bDoSize (false),
+bKeepFmt(false),
+bStripData  (false),
+bIsAdvanced (false),
+bDBSelection(false),
+nIndex  (0),
+bAutoFilter (false),
+bModified   (false)
+{
+aUpper = ScGlobal::pCharClass->uppercase(aUpper);
+}
+
 ScDBData::ScDBData( const OUString& rName,
 SCTAB nTab,
 SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
@@ -403,6 +431,16 @@ void ScDBData::SetImportParam(const ScImportParam& 
rImportParam)
 mpImportParam.reset(new ScImportParam(rImportParam));
 }
 
+void ScDBData::SetTableData(const ScTableData& rTableData)
+{
+*mpTableData = rTableData;
+}
+
+void ScDBData::GetTableData(ScTableData& rTableData)
+{
+rTableData = *mpTableData;
+}
+
 bool ScDBData::IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool 
bStartOnly) const
 {
 if (nTab == nTable)
diff --git a/sc/source/filter/oox/datatablebuffer.cxx 
b/sc/source/filter/oox/datatablebuffer.cxx
index 843fb44..36b602e 100644
--- a/sc/source/filter/oox/datatablebuffer.cxx
+++ b/sc/source/filter/oox/datatablebuffer.cxx
@@ -19,6 +19,17 @@ ScTableData& TableDataBuffer::createDataTable(const 
OUString& rId)
 return aData.first->second;
 }
 
+ScTableData& TableDataBuffer::getTable(const OUString& rId)
+{
+std::map::iterator itr =
+maTableData.find(rId);
+
+if(itr != maTableData.end())
+return itr->second;
+
+throw std::exception();
+}
+
 }
 }
 
diff --git a/sc/source/filter/oox/datatablebuffer.hxx 
b/sc/source/filter/oox/datatablebuffer.hxx
index 59bac7a..13e366a 100644
--- a/sc/source/filter/oox/datatablebuffer.hxx
+++ b/sc/source/filter/oox/datatablebuffer.hxx
@@ -21,6 +21,7 @@ class TableDataBuffer
 {
 public:
 ScTableData& createDataTable(const OUString& rId);
+ScTableData& getTable(const OUString& rId);
 private:
 std::map m

Re: Sort and copy results

[Kevin André]

On Mon, Jun 30, 2014 at 4:41 PM, Kohei Yoshida
 wrote:
> On Mon, 2014-06-30 at 16:34 +0200, Kevin André wrote:
>> On Fri, Jun 6, 2014 at 1:42 PM, Wols Lists  wrote:
>> >
>> > That's one of my moans (maybe it's been fixed) about LO spellcheck! It's
>> > too long ago to remember the details, and it was in a cell (can't
>> > remember whether it was a Writer table or Calc). Anyways, I filled the
>> > cell and tabbed away. The AutoCorrupt kicked in. And  reversed
>> > the ENTIRE operation, deleting the text I'd typed! I just *could* *not*
>> > work out how to get LO to accept what I'd typed without insisting on
>> > corrupting it.
>> >
>> > So it makes a lot of sense, in many circumstances, for a user's input to
>> > be treated as multiple steps requiring multiple undos, even when it's
>> > just one user action that triggers it.
>>
>> This.
>> Please check out bug #36867 which I filed 3 years ago and still isn't fixed.
>
> Just so you know, piggybacking on a thread and say "please fix my
> favorite bug I filed x years ago" is not appreciated.

Sorry if I offended you. Reading about "AutoCorrupt" as written by
Wols reminded me of this bug as it is about the very same subject: the
lack of separate undo for multiple steps (user input +
autocorrection). It's also not my favorite bug; I actually don't
really care much about it anymore since I it hasn't affected me in a
long time. But maybe there are other users like Wols who are still
running into this. The bug just seemed relevant to what Wols said,
that's why I mentioned it here.


Regards,

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

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

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

New commits:
commit 0ee6282cc24af0d299a878f780d1678a86fb0595
Author: Caolán McNamara 
Date:   Mon Jun 30 15:02:44 2014 +0100

Updated core
Project: help  4afc42f9eb3f50b542f22414045856bfc588855e

diff --git a/helpcontent2 b/helpcontent2
index 0b6e8e1..4afc42f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0b6e8e1c94332513d8f49fc9975f31c6be860847
+Subproject commit 4afc42f9eb3f50b542f22414045856bfc588855e
___
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

[Caolán McNamara]

 helpers/help_hid.lst   |   15 ---
 source/text/shared/01/0102.xhp |   28 +++-
 source/text/shared/01/0107.xhp |4 ++--
 3 files changed, 13 insertions(+), 34 deletions(-)

New commits:
commit 4afc42f9eb3f50b542f22414045856bfc588855e
Author: Caolán McNamara 
Date:   Mon Jun 30 15:02:44 2014 +0100

update help ids for file picker .ui conversion

Change-Id: Ia6e6f34a0762cff50b4dfbafe0abd59620e391bb

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 5d70b29..ff90cf3 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1399,7 +1399,6 @@ HID_FIELDLINK_DETAIL_COLUMN,37917,
 HID_FIELDLINK_MASTER_COLUMN,37918,
 HID_FIELD_SEL,38070,
 HID_FIELD_SEL_WIN,38071,
-HID_FILEDLG_AUTOCOMPLETEBOX,33286,
 HID_FILEDLG_CHARDLG,53063,
 HID_FILEDLG_FRMPAGE,53068,
 HID_FILEDLG_INSERT_BTN,33290,
@@ -1413,7 +1412,6 @@ HID_FILEDLG_SRCVIEW,53069,
 HID_FILEDLG_STANDARD,33095,
 HID_FILEDLG_WIZDOKU,53070,
 HID_FILEOPEN_IMAGE_TEMPLATE,33018,
-HID_FILEOPEN_READONLY,33016,
 HID_FILEOPEN_VERSION,33017,
 HID_FILESAVE_AUTOEXTENSION,33010,
 HID_FILESAVE_CREATEDIRECTORY,33003,
@@ -5171,19 +5169,6 @@ 
filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_SLIDE_CONTENTS,1090520068,
 filter_CheckBox_DLG_OPTIONS_BOOL_EXPORT_SOUND,1090520069,
 filter_ModalDialog_DLG_OPTIONS,1090519040,
 filter_NumericField_DLG_OPTIONS_NUM_FLD_QUALITY,1090525185,
-fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_AUTO_EXTENSION,1334641706,
-fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_EXPLORERFILE_PASSWORD,1334641705,
-fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_EXPLORERFILE_READONLY,1334641704,
-fpicker_CheckBox_DLG_SVT_EXPLORERFILE_CB_OPTIONS,1334641707,
-fpicker_Edit_DLG_SVT_EXPLORERFILE_ED_EXPLORERFILE_FILENAME,1334642719,
-fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_DETAILSVIEW,1334652429,
-fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_LISTVIEW,1334652428,
-fpicker_ImageButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_NEWFOLDER,1334652427,
-fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_FILETYPE,1334644259,
-fpicker_ListBox_DLG_SVT_EXPLORERFILE_LB_EXPLORERFILE_SHARED_LISTBOX,1334644257,
-fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARD,1334652943,
-fpicker_MenuButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_UP,1334652942,
-fpicker_PushButton_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_OPEN,1334645264,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_FOOTERLST,2114719236,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_GROUPONLST,2114719238,
 reportdesign_ListBox_RID_GROUPS_SORTING_LST_HEADERLST,2114719234,
diff --git a/source/text/shared/01/0102.xhp 
b/source/text/shared/01/0102.xhp
index 2038aeb..d2344de 100644
--- a/source/text/shared/01/0102.xhp
+++ b/source/text/shared/01/0102.xhp
@@ -41,28 +41,25 @@
   styles; 'changed' message
 mw replaced "wildcards" by "regular 
expressions"mw deleted "regular expressions;" and 
"files;"
 
-
-
+
 Open
-  Opens 
or imports a file.
+  Opens or imports a 
file.
 
 
 
 
 The following sections describe the %PRODUCTNAME Open dialog box. To 
activate the %PRODUCTNAME Open and 
Save dialog boxes, choose %PRODUCTNAME - 
PreferencesTools - 
Options - %PRODUCTNAME- General, and then select the Use 
%PRODUCTNAME dialogs in the Open/Save dialogs 
area.
 If the file that you want to open contains Styles, special 
rules apply.
-
 
-
+
 Up One Level
-  Move up one 
folder in the folder hierarchy. Long-click to see the higher level 
folders.UFI: it is still a long-click
+  Move up one folder 
in the folder hierarchy. Long-click to see the higher level 
folders.UFI: it is still a long-click
   
-
-
+
 Create New Folder
-  Creates
 a new folder.
+  Creates a new 
folder.
   
   
   
 Click to delete all selected files.
 
-
+
 File name
-  Enter a file 
name or a path for the file. You can also enter a URL that starts with 
the protocol name ftp, http, or https.
+  Enter a file name or a path for 
the file. You can also enter a URL that starts with the protocol name ftp, http, or 
https.
   If you want, you can use wildcards in the File name 
box to filter the list of files that is displayed.
   
 For example, to list all of the text files in a 
folder, enter the asterisk wildcard with the text file extension (*.txt), and 
then click Open. Use the question mark (?) wildcard to represent 
any character, as in (??3*.txt), which only displays text files with a '3' as 
the third character in the file name.
@@ -102,16 +99,13 @@
 Version
   If there are multiple versions of 
the selected file, select the version that you want to open. You can 
save and organize multiple versions of a document by choosing File - 
Versions. The versions of a document are opened in read-only 
mode.
-
-
+
 File type
-  Select the 
file type that you want to open, or select All Files (*) to 
display a list of all of the files in the folder.
-
-
+  Select the file type that you 
want to o

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - b7/aea08c86d2ca1f2c97ca191d5530a2b01acd8c

[Caolán McNamara]

 b7/aea08c86d2ca1f2c97ca191d5530a2b01acd8c |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 584eda3642aab69484f726e4799fec7d6034bd56
Author: Caolán McNamara 
Date:   Mon Jun 30 16:32:49 2014 +0100

Notes added by 'git notes add'

diff --git a/b7/aea08c86d2ca1f2c97ca191d5530a2b01acd8c 
b/b7/aea08c86d2ca1f2c97ca191d5530a2b01acd8c
new file mode 100644
index 000..8e5c182
--- /dev/null
+++ b/b7/aea08c86d2ca1f2c97ca191d5530a2b01acd8c
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/frmdlg/frmpage.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 9a2120a4814975f52648700bb11ceec1df42f79b
Author: Caolán McNamara 
Date:   Mon Jun 30 16:29:48 2014 +0100

Resolves: fdo#80681 widget is not transparent

regression from 12dfca2ea61116665a7abefd43a9a4caa2b8920b
Author: Armin Le Grand 
Date:   Mon May 14 15:16:00 2012 +
Resolves: #i119307# added deletion of sw's BmpWindow control...
...due to the fact that graphics may be transparent

Change-Id: I7eb2ee8ed53f0ef907a4573a735c71de43b6e8d3
(cherry picked from commit 1caad856de1c1c5b0a8c31d2226416a2db9632cd)

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 9a9cc62..cd22bb5 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2605,8 +2605,12 @@ BmpWindow::BmpWindow(Window* pPar, WinBits nStyle)
 , bGraphic(false)
 , bLeftAlign(false)
 {
-// #i119307# use background, the graphic might have transparency
-SetBackground(Wallpaper(Color(COL_WHITE)));
+SetBackground();
+SetPaintTransparent(sal_True);
+// #i119307# the graphic might have transparency, set up white as the color
+// to use when drawing a rectangle under the image
+SetLineColor(COL_WHITE);
+SetFillColor(COL_WHITE);
 }
 
 Size BmpWindow::GetOptimalSize() const
@@ -2664,7 +2668,7 @@ void BmpWindow::Paint( const Rectangle& )
 }
 
 // #i119307# clear window background, the graphic might have transparency
-Erase();
+DrawRect(Rectangle(aPntPos, aPntSz));
 
 if ( bGraphic )
 aGraphic.Draw( this, aPntPos, aPntSz );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Sort and copy results

[Kohei Yoshida]

On Mon, 2014-06-30 at 17:13 +0200, Kevin André wrote:
> On Mon, Jun 30, 2014 at 4:41 PM, Kohei Yoshida

> > Just so you know, piggybacking on a thread and say "please fix my
> > favorite bug I filed x years ago" is not appreciated.
> 
> Sorry if I offended you.

No offense was taken; I just did not appreciate it, wanted to express it
partly because this happen more often than I'd like to see.

> the
> lack of separate undo for multiple steps (user input +
> autocorrection). It's also not my favorite bug; I actually don't
> really care much about it anymore since I it hasn't affected me in a
> long time. But maybe there are other users like Wols who are still
> running into this. The bug just seemed relevant to what Wols said,
> that's why I mentioned it here.

Understood.  But then, the main topic of this thread is about Calc's
sorting, so trying not to steer too much away from it would be
appreciated.

Best,

Kohei


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

[Libreoffice-commits] core.git: Branch 'private/kohei/sort-ref-update' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/table.hxx   |2 +-
 sc/source/core/data/table3.cxx |   25 +
 2 files changed, 14 insertions(+), 13 deletions(-)

New commits:
commit ed08bc017ef65db98179ff910e9d57811120305c
Author: Kohei Yoshida 
Date:   Mon Jun 30 12:02:11 2014 -0400

Pass ScSortParam to this rather than using the data member.

I need a variant of this method that doesn't use ScSortParam...

Change-Id: I1bba02f2db5fba5c5ee985b3adfe566d99079835

diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index 9f0cff2..d84340f 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -1021,7 +1021,7 @@ private:
 ScRefCellValue& rCell2, SCCOL nCell2Col, SCROW nCell2Row ) const;
 short   Compare(SCCOLROW nIndex1, SCCOLROW nIndex2) const;
 short   Compare( ScSortInfoArray*, SCCOLROW nIndex1, SCCOLROW nIndex2) 
const;
-ScSortInfoArray* CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2, bool 
bKeepQuery );
+ScSortInfoArray* CreateSortInfoArray( const ScSortParam& rSortParam, 
SCCOLROW nInd1, SCCOLROW nInd2, bool bKeepQuery );
 voidQuickSort( ScSortInfoArray*, SCsCOLROW nLo, SCsCOLROW nHi);
 void SortReorderByColumn( ScSortInfoArray* pArray, ScProgress* pProgress );
 void SortReorderByRow( ScSortInfoArray* pArray, ScProgress* pProgress );
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index e83f86f..85a6cad 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -348,19 +348,20 @@ public:
 }
 };
 
-ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2, 
bool bKeepQuery )
+ScSortInfoArray* ScTable::CreateSortInfoArray(
+const ScSortParam& rSortParam, SCCOLROW nInd1, SCCOLROW nInd2, bool 
bKeepQuery )
 {
 sal_uInt16 nUsedSorts = 1;
-while ( nUsedSorts < aSortParam.GetSortKeyCount() && 
aSortParam.maKeyState[nUsedSorts].bDoSort )
+while ( nUsedSorts < rSortParam.GetSortKeyCount() && 
rSortParam.maKeyState[nUsedSorts].bDoSort )
 nUsedSorts++;
 ScSortInfoArray* pArray = new ScSortInfoArray( nUsedSorts, nInd1, nInd2 );
 pArray->SetKeepQuery(bKeepQuery);
 
-if ( aSortParam.bByRow )
+if ( rSortParam.bByRow )
 {
 for ( sal_uInt16 nSort = 0; nSort < nUsedSorts; nSort++ )
 {
-SCCOL nCol = 
static_cast(aSortParam.maKeyState[nSort].nField);
+SCCOL nCol = 
static_cast(rSortParam.maKeyState[nSort].nField);
 ScColumn* pCol = &aCol[nCol];
 sc::ColumnBlockConstPosition aBlockPos;
 pCol->InitBlockPosition(aBlockPos);
@@ -374,9 +375,9 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW 
nInd1, SCCOLROW nInd2, b
 
 // Fill row-wise data table.
 ScSortInfoArray::RowsType& rRows = pArray->InitDataRows(
-nInd2 - nInd1 + 1, aSortParam.nCol2 - aSortParam.nCol1 + 1);
+nInd2 - nInd1 + 1, rSortParam.nCol2 - rSortParam.nCol1 + 1);
 
-for (SCCOL nCol = aSortParam.nCol1; nCol <= aSortParam.nCol2; ++nCol)
+for (SCCOL nCol = rSortParam.nCol1; nCol <= rSortParam.nCol2; ++nCol)
 {
 ScColumn& rCol = aCol[nCol];
 
@@ -388,14 +389,14 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW 
nInd1, SCCOLROW nInd2, b
 for (SCROW nRow = nInd1; nRow <= nInd2; ++nRow)
 {
 ScSortInfoArray::Row& rRow = *rRows[nRow-nInd1];
-ScSortInfoArray::Cell& rCell = 
rRow.maCells[nCol-aSortParam.nCol1];
+ScSortInfoArray::Cell& rCell = 
rRow.maCells[nCol-rSortParam.nCol1];
 
 rCell.maCell = rCol.GetCellValue(aBlockPos, nRow);
 rCell.mpAttr = rCol.GetCellTextAttr(aBlockPos, nRow);
 rCell.mpBroadcaster = rCol.GetBroadcaster(aBlockPos, nRow);
 rCell.mpNote = rCol.GetCellNote(aBlockPos, nRow);
 
-if (!bUniformPattern && aSortParam.bIncludePattern)
+if (!bUniformPattern && rSortParam.bIncludePattern)
 rCell.mpPattern = rCol.GetPattern(nRow);
 }
 }
@@ -414,7 +415,7 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW 
nInd1, SCCOLROW nInd2, b
 {
 for ( sal_uInt16 nSort = 0; nSort < nUsedSorts; nSort++ )
 {
-SCROW nRow = aSortParam.maKeyState[nSort].nField;
+SCROW nRow = rSortParam.maKeyState[nSort].nField;
 for ( SCCOL nCol = static_cast(nInd1);
 nCol <= static_cast(nInd2); nCol++ )
 {
@@ -1117,7 +1118,7 @@ void ScTable::Sort(
 if(pProgress)
 pProgress->SetState( 0, nLastRow-nRow1 );
 
-boost::scoped_ptr 
pArray(CreateSortInfoArray(nRow1, nLastRow, bKeepQuery));
+boost::scoped_ptr 
pArray(CreateSortInfoArray(aSortParam, nRow1, nLastRow, bKeepQuery));
 
 if ( nLastRow - nRow1 > 255 )
 DecoladeRow(pArray.get(), nRow1, nLastRow);
@@ -1148,7 +1149

[Libreoffice-commits] core.git: Branch 'feature/aoo-fillattribute' - svx/source

[Miklos Vajna]

 svx/source/unodraw/unobrushitemhelper.cxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit fc1727cb321e452cc2289315009f27243d6245a1
Author: Miklos Vajna 
Date:   Mon Jun 30 18:04:18 2014 +0200

getSvxBrushItemFromSourceSet: add fix for JunitTest_sw_complex

Change-Id: I826cd15923ecb2088161e4cf9650b2f388fd84b5

diff --git a/svx/source/unodraw/unobrushitemhelper.cxx 
b/svx/source/unodraw/unobrushitemhelper.cxx
index c95c200..f6fe915 100644
--- a/svx/source/unodraw/unobrushitemhelper.cxx
+++ b/svx/source/unodraw/unobrushitemhelper.cxx
@@ -191,7 +191,15 @@ SvxBrushItem getSvxBrushItemFromSourceSet(const 
SfxItemSet& rSourceSet, sal_uInt
 
 if(!pXFillStyleItem || XFILL_NONE == pXFillStyleItem->GetValue())
 {
-Color aFillColor(COL_AUTO);
+// no fill, still need to rescue the evtl. set RGB color, but use as 
transparent color (we have XFILL_NONE)
+Color aFillColor(static_cast< const XFillColorItem& 
>(rSourceSet.Get(XATTR_FILLCOLOR, bSearchInParents)).GetColorValue());
+
+// when fill style is none, then don't allow anything other than 0 or 
auto.
+if (aFillColor.GetColor() != 0)
+aFillColor.SetColor(COL_AUTO);
+
+aFillColor.SetTransparency(0xff);
+
 return SvxBrushItem(aFillColor, nBackgroundID);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/tools sfx2/source svl/source

[Stephan Bergmann]

 include/tools/link.hxx|   20 ++--
 sfx2/source/appl/shutdownicon.hxx |4 +++-
 svl/source/numbers/zforlist.cxx   |2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 6bb92c5eaf1ff2f5292442870c65bfe2771752ec
Author: Stephan Bergmann 
Date:   Mon Jun 30 18:24:30 2014 +0200

Make sure IMPL_STATIC_LINK's type matches Link::pFunc's type

...to avoid -fsanitize=function warnings in Link::Call.

Change-Id: I837b35bd3052716fbb41bf4f893961257d1f9b2c

diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index 9514222..c603c0e 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -31,6 +31,7 @@ typedef long (*PSTUB)( void*, void* );
 static long LinkStub##Method( void* pThis, void* )
 
 #define DECL_STATIC_LINK( Class, Method, ArgType ) \
+static long LinkStub##Method( void* pThis, void* ); \
 static long Method( Class*, ArgType )
 
 #define DECL_DLLPRIVATE_LINK(Method, ArgType) \
@@ -38,6 +39,7 @@ typedef long (*PSTUB)( void*, void* );
 SAL_DLLPRIVATE static long LinkStub##Method(void * pThis, void *)
 
 #define DECL_DLLPRIVATE_STATIC_LINK(Class, Method, ArgType) \
+SAL_DLLPRIVATE static long LinkStub##Method( void* pThis, void* ); \
 SAL_DLLPRIVATE static long Method(Class *, ArgType)
 
 #define IMPL_STUB(Class, Method, ArgType) \
@@ -47,16 +49,30 @@ typedef long (*PSTUB)( void*, void* );
 }
 
 #define IMPL_STATIC_LINK( Class, Method, ArgType, ArgName ) \
+long Class::LinkStub##Method( void* pThis, void* pCaller) \
+{ \
+return Method( (Class*)pThis, (ArgType)pCaller ); \
+} \
 long Class::Method( Class* pThis, ArgType ArgName )
 
 #define IMPL_STATIC_LINK_NOINSTANCE( Class, Method, ArgType, ArgName ) \
+long Class::LinkStub##Method( void* pThis, void* pCaller) \
+{ \
+return Method( (Class*)pThis, (ArgType)pCaller ); \
+} \
 long Class::Method( SAL_UNUSED_PARAMETER Class*, ArgType ArgName )
 
+#define IMPL_STATIC_LINK_NOINSTANCE_NOARG( Class, Method ) \
+long Class::LinkStub##Method( void* pThis, void* pCaller) \
+{ \
+return Method( (Class*)pThis, pCaller ); \
+} \
+long Class::Method( SAL_UNUSED_PARAMETER Class*, SAL_UNUSED_PARAMETER 
void* )
+
 #define LINK( Inst, Class, Member ) \
 Link( (Class*)Inst, (PSTUB)&Class::LinkStub##Member )
 
-#define STATIC_LINK( Inst, Class, Member ) \
-Link( (Class*)Inst, (PSTUB)&Class::Member )
+#define STATIC_LINK( Inst, Class, Member ) LINK(Inst, Class, Member)
 
 #define IMPL_LINK( Class, Method, ArgType, ArgName ) \
 IMPL_STUB( Class, Method, ArgType ) \
diff --git a/sfx2/source/appl/shutdownicon.hxx 
b/sfx2/source/appl/shutdownicon.hxx
index d91ded5..7483b71 100644
--- a/sfx2/source/appl/shutdownicon.hxx
+++ b/sfx2/source/appl/shutdownicon.hxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class ResMgr;
 namespace sfx2
@@ -125,7 +126,8 @@ class SFX2_DLLPUBLIC ShutdownIcon : public 
ShutdownIconServiceBase
 
 voidStartFileDialog();
 sfx2::FileDialogHelper* GetFileDialog() const { return m_pFileDlg; }
-static long DialogClosedHdl_Impl( ShutdownIcon*, 
sfx2::FileDialogHelper* );
+DECL_STATIC_LINK(
+ShutdownIcon, DialogClosedHdl_Impl, sfx2::FileDialogHelper*);
 
 static bool IsQuickstarterInstalled();
 
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 9dfe613..020d845 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -3262,7 +3262,7 @@ const NfCurrencyEntry* 
SvNumberFormatter::GetLegacyOnlyCurrencyEntry( const OUSt
 
 
 // static
-IMPL_STATIC_LINK_NOINSTANCE( SvNumberFormatter, CurrencyChangeLink, 
SAL_UNUSED_PARAMETER void*, EMPTYARG )
+IMPL_STATIC_LINK_NOINSTANCE_NOARG( SvNumberFormatter, CurrencyChangeLink )
 {
 ::osl::MutexGuard aGuard( GetMutex() );
 OUString aAbbrev;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Zolnai Tamás]

 slideshow/source/engine/shapes/viewmediashape.cxx |8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 358d6006f1d9652aaf01661ea8dba4d7ec46d508
Author: Zolnai Tamás 
Date:   Mon Jun 30 16:59:42 2014 +0200

Optimize media rendering during slideshow: save one grabFrame() call

'FallbackGraphic' property introduced in:
b862a216f769d10e726ad759762b5e6a412acdaf
contains the previously called grabFrame's
result, so we can use that instead of render the media
frame again (it affects glTF models too).

Change-Id: Ia93e771e92cc7630480c665dea66fbf571dfa2a0

diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx 
b/slideshow/source/engine/shapes/viewmediashape.cxx
index c11aaf5..9ebc014 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -196,16 +196,14 @@ namespace slideshow
 
 if( !mpMediaWindow.get() && !mxPlayerWindow.is() )
 {
-OUString sURL;
-OUString sMimeType;
+uno::Reference< graphic::XGraphic > xGraphic;
 uno::Reference< beans::XPropertySet > xPropSet( mxShape, 
uno::UNO_QUERY );
 if (xPropSet.is())
 {
-xPropSet->getPropertyValue("PrivateTempFileURL") >>= sURL;
-xPropSet->getPropertyValue("MediaMimeType") >>= sMimeType;
+xPropSet->getPropertyValue("FallbackGraphic") >>= xGraphic;
 }
 
-const Graphic 
aGraphic(avmedia::MediaWindow::grabFrame(sURL,"",sMimeType));
+Graphic aGraphic(xGraphic);
 const BitmapEx aBmp = aGraphic.GetBitmapEx();
 
 uno::Reference< rendering::XBitmap > 
xBitmap(vcl::unotools::xBitmapFromBitmapEx(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerfilter/source/rtftok/rtfsdrimport.cxx |   40 ++--
 1 file changed, 21 insertions(+), 19 deletions(-)

New commits:
commit c64a54bc3eb15809bc56c19c1f013954d9bfde7a
Author: Miklos Vajna 
Date:   Mon Jun 30 18:38:09 2014 +0200

Use comphelper::SequenceAsVector

Change-Id: I8c0328b1bae3d2c3f327d241acf3df0c078ea4cf

diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx 
b/writerfilter/source/rtftok/rtfsdrimport.cxx
index c26999b..59fa698 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -390,21 +390,17 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, 
ShapeOrPict const shap
 }
 else if (i->first == "pSegmentInfo")
 {
-uno::Sequence aSegments;
+comphelper::SequenceAsVector 
aSegments;
 sal_Int32 nSize = 0;
 sal_Int32 nCount = 0;
 sal_Int32 nCharIndex = 0;
-sal_Int32 nIndex = 0;
 do
 {
 sal_Int32 nSeg = i->second.getToken(0, ';', 
nCharIndex).toInt32();
 if (!nSize)
 nSize = nSeg;
 else if (!nCount)
-{
 nCount = nSeg;
-aSegments.realloc(nCount);
-}
 else
 {
 sal_Int32 nPoints = 1;
@@ -414,23 +410,28 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, 
ShapeOrPict const shap
 nSeg &= 0xFF00;
 }
 
+drawing::EnhancedCustomShapeSegment aSegment;
 switch (nSeg)
 {
 case 0x0001: // lineto
-aSegments[nIndex].Command = 
drawing::EnhancedCustomShapeSegmentCommand::LINETO;
-aSegments[nIndex].Count = sal_Int32(1);
+aSegment.Command = 
drawing::EnhancedCustomShapeSegmentCommand::LINETO;
+aSegment.Count = sal_Int32(1);
+aSegments.push_back(aSegment);
 break;
 case 0x4000: // moveto
-aSegments[nIndex].Command = 
drawing::EnhancedCustomShapeSegmentCommand::MOVETO;
-aSegments[nIndex].Count = sal_Int32(1);
+aSegment.Command = 
drawing::EnhancedCustomShapeSegmentCommand::MOVETO;
+aSegment.Count = sal_Int32(1);
+aSegments.push_back(aSegment);
 break;
 case 0x2000: // curveto
-aSegments[nIndex].Command = 
drawing::EnhancedCustomShapeSegmentCommand::CURVETO;
-aSegments[nIndex].Count = sal_Int32(nPoints);
+aSegment.Command = 
drawing::EnhancedCustomShapeSegmentCommand::CURVETO;
+aSegment.Count = sal_Int32(nPoints);
+aSegments.push_back(aSegment);
 break;
 case 0xb300: // arcto
-aSegments[nIndex].Command = 
drawing::EnhancedCustomShapeSegmentCommand::ARCTO;
-aSegments[nIndex].Count = sal_Int32(0);
+aSegment.Command = 
drawing::EnhancedCustomShapeSegmentCommand::ARCTO;
+aSegment.Count = sal_Int32(0);
+aSegments.push_back(aSegment);
 break;
 case 0xac00:
 case 0xaa00: // nofill
@@ -438,20 +439,21 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, 
ShapeOrPict const shap
 case 0x6001: // close
 break;
 case 0x8000: // end
-aSegments[nIndex].Command = 
drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH;
-aSegments[nIndex].Count = sal_Int32(0);
+aSegment.Command = 
drawing::EnhancedCustomShapeSegmentCommand::ENDSUBPATH;
+aSegment.Count = sal_Int32(0);
+aSegments.push_back(aSegment);
 break;
 default: // given number of lineto elements
-aSegments[nIndex].Command = 
drawing::EnhancedCustomShapeSegmentCommand::LINETO;
-aSegments[nIndex].Count = nSeg;
+aSegment.Command = 
drawing::EnhancedCustomShapeSegmentCommand::LINETO;
+aSegment.Count = nSeg;
+aSegments.push_back(aSegment);
 break;
 }
-nIndex++;
 }
 }
 while (nCharIndex >= 0);
 aPropertyValue.Name = "Segments";
-aPropertyValue.Value <<= aSegments;
+aPropertyValue.Value <<= aSegments.

Re: Code location / class names for Change Object Connector control points

[David Tardon]

Hi,

On Mon, Jun 30, 2014 at 03:50:47PM +0100, Rob Collins wrote:
> 
> 
> N.B. This is a follow-up to my previous question on where to find edge
> (connector) code - which was successfully answered - so thank you for that!
> 
> I am now looking for the code that implements the 'control points' on
> connecting lines. That is, when drawing an edge between two nodes the edge
> (connector) can be dragged into a new path using 'control points' that
> appear on each line segment.
> 
> As previously - where is the code for this? What symbols / classes /
> filenames should I be searching for?

These are called handles and they are implemented by class SdrHdl and
classes derived from it, in svx/source/svdraw/svdhdl.cxx . Connectors
use ImplEdgeHdl; the code that creates them is in SdrEdgeObj::GetHdl() .

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - offapi/com offapi/UnoApi_offapi.mk

[Mihai Varga]

 offapi/UnoApi_offapi.mk  |1 
 offapi/com/sun/star/ucb/XInteractionAuthFallback.idl |   42 +++
 2 files changed, 43 insertions(+)

New commits:
commit ec539bbcfb2b56bb6be2f7eaccdf401f8e9a2869
Author: Mihai Varga 
Date:   Mon Jun 30 20:20:36 2014 +0300

Continuation IDL

Change-Id: Iadee6a62ff1a1190172e39ba6803621be61e7570

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index fb67c26..9044200 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -3936,6 +3936,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,offapi,com/sun/star/ucb,\
XFetchProvider \
XFetchProviderForContentAccess \
XFileIdentifierConverter \
+   XInteractionAuthFallback \
XInteractionHandlerSupplier \
XInteractionReplaceExistingData \
XInteractionSupplyAuthentication \
diff --git a/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl 
b/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl
new file mode 100644
index 000..0cb9038
--- /dev/null
+++ b/offapi/com/sun/star/ucb/XInteractionAuthFallback.idl
@@ -0,0 +1,42 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef __com_sun_star_task_XInteractionApprove_idl__
+#define __com_sun_star_task_XInteractionApprove_idl__
+
+#include 
+
+
+
+ module com {  module sun {  module star {  module ucb {
+
+/** An interaction continuation specifying authentication success.
+ */
+published interface XInteractionAuthFallback: 
com::sun::star::task::XInteractionContinuation
+{
+/* Authentication code submited by the user */
+void setCode( [in] string code );
+string getCode( );
+};
+
+
+}; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - include/ucbhelper ucbhelper/source

[Mihai Varga]

 include/ucbhelper/interactionrequest.hxx |   34 +
 ucbhelper/source/provider/interactionrequest.cxx |   56 +++
 2 files changed, 90 insertions(+)

New commits:
commit 2f86b03eca4805fad2b3a63d03257d5e2da6fbd7
Author: Mihai Varga 
Date:   Mon Jun 30 20:22:20 2014 +0300

Continuation implementation

Change-Id: Iff0df4427affe374e8e2909beb641cb7ad53f0fc

diff --git a/include/ucbhelper/interactionrequest.hxx 
b/include/ucbhelper/interactionrequest.hxx
index 51883c7..86531b9 100644
--- a/include/ucbhelper/interactionrequest.hxx
+++ b/include/ucbhelper/interactionrequest.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -714,6 +715,39 @@ public:
 throw( com::sun::star::uno::RuntimeException, std::exception ) 
SAL_OVERRIDE;
 };
 
+class UCBHELPER_DLLPUBLIC InteractionAuthFallback:
+  public InteractionContinuation,
+  public com::sun::star::ucb::XInteractionAuthFallback
+{
+OUString m_aCode;
+
+public:
+InteractionAuthFallback( InteractionRequest * pRequest )
+: InteractionContinuation( pRequest ) {}
+
+// XInterface
+virtual com::sun::star::uno::Any SAL_CALL
+queryInterface( const com::sun::star::uno::Type & rType )
+throw( com::sun::star::uno::RuntimeException, std::exception ) 
SAL_OVERRIDE;
+virtual void SAL_CALL acquire()
+throw() SAL_OVERRIDE;
+virtual void SAL_CALL release()
+throw() SAL_OVERRIDE;
+
+// XInteractionContinuation
+virtual void SAL_CALL select()
+throw( com::sun::star::uno::RuntimeException, std::exception ) 
SAL_OVERRIDE;
+
+// XAuthFallback
+virtual void SAL_CALL setCode( const OUString& code )
+throw (::css::uno::RuntimeException, ::std::exception);
+virtual OUString SAL_CALL getCode()
+throw (::css::uno::RuntimeException, ::std::exception);
+
+
+};
+
+
 } // namespace ucbhelper
 
 #endif /* ! INCLUDED_UCBHELPER_INTERACTIONREQUEST_HXX */
diff --git a/ucbhelper/source/provider/interactionrequest.cxx 
b/ucbhelper/source/provider/interactionrequest.cxx
index c1d4617..1ad713a 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.cxx
@@ -1041,4 +1041,60 @@ void SAL_CALL InteractionReplaceExistingData::select()
 recordSelection();
 }
 
+// InteractionAuthFallback Implementation
+
+// XInterface methods.
+
+// virtual
+void SAL_CALL InteractionAuthFallback::acquire()
+throw()
+{
+OWeakObject::acquire();
+}
+
+// virtual
+void SAL_CALL InteractionAuthFallback::release()
+throw()
+{
+OWeakObject::release();
+}
+
+// virtual
+uno::Any SAL_CALL
+InteractionAuthFallback::queryInterface( const uno::Type & rType )
+throw ( uno::RuntimeException, std::exception )
+{
+uno::Any aRet = cppu::queryInterface( rType,
+static_cast< task::XInteractionContinuation * >( this ),
+static_cast< ucb::XInteractionAuthFallback * >( this ));
+
+return aRet.hasValue()
+? aRet : InteractionContinuation::queryInterface( rType );
+}
+
+// XInteractionContinuation methods.
+
+// virtual
+void SAL_CALL InteractionAuthFallback::select()
+throw( uno::RuntimeException, std::exception )
+{
+recordSelection();
+}
+
+// XInteractionAuthFallback methods
+
+// virtual
+void SAL_CALL InteractionAuthFallback::setCode( const OUString& code )
+throw ( uno::RuntimeException, std::exception )
+{
+m_aCode = code;
+}
+
+// virtual
+OUString SAL_CALL InteractionAuthFallback::getCode( )
+throw ( uno::RuntimeException, std::exception )
+{
+return m_aCode;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - include/ucbhelper ucbhelper/source

[Mihai Varga]

 include/ucbhelper/authenticationfallback.hxx |   13 -
 ucbhelper/source/provider/authenticationfallback.cxx |7 +++
 2 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit fde54c22eab44a33599d067c838508ac1ac0055e
Author: Mihai Varga 
Date:   Mon Jun 30 20:24:16 2014 +0300

Continuations are set in the request

diff --git a/include/ucbhelper/authenticationfallback.hxx 
b/include/ucbhelper/authenticationfallback.hxx
index 19a6b7f..c73383a 100644
--- a/include/ucbhelper/authenticationfallback.hxx
+++ b/include/ucbhelper/authenticationfallback.hxx
@@ -23,6 +23,8 @@
 #include 
 #include 
 #include 
+#include 
+
 
 namespace ucbhelper {
 
@@ -35,10 +37,9 @@ namespace ucbhelper {
   */
 class UCBHELPER_DLLPUBLIC AuthenticationFallbackRequest : public 
ucbhelper::InteractionRequest
 {
+private:
+rtl::Reference< ucbhelper::InteractionAuthFallback > m_xAuthFallback; 
 
-OUString m_Instructions;
-OUString m_Url;
-OUString m_Code;
 public:
 /**
   * Constructor.
@@ -48,8 +49,10 @@ public:
   */
 AuthenticationFallbackRequest( const OUString & rInstructions,
  const OUString & rURL );
-void setCode( const OUString & code ) { m_Code = code; }
-OUString getCode( ) { return m_Code; }
+
+const rtl::Reference< ucbhelper::InteractionAuthFallback >&
+getAuthFallbackInter( ) const { return m_xAuthFallback; } 
+
 };
 
 } // namespace ucbhelper
diff --git a/ucbhelper/source/provider/authenticationfallback.cxx 
b/ucbhelper/source/provider/authenticationfallback.cxx
index 8171cc2..7f47b09 100644
--- a/ucbhelper/source/provider/authenticationfallback.cxx
+++ b/ucbhelper/source/provider/authenticationfallback.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
 #include 
 
 using namespace com::sun::star;
@@ -33,12 +32,12 @@ 
AuthenticationFallbackRequest::AuthenticationFallbackRequest(
 aRequest.url = rURL;
 
 setRequest( uno::makeAny( aRequest ) );
+m_xAuthFallback = new InteractionAuthFallback( this );
 
 uno::Sequence<
-uno::Reference< task::XInteractionContinuation > > aContinuations( 3 );
+uno::Reference< task::XInteractionContinuation > > aContinuations( 2 );
 aContinuations[ 0 ] = new InteractionAbort( this );
-aContinuations[ 1 ] = new InteractionRetry( this );
-aContinuations[ 2 ] = new InteractionApprove( this );
+aContinuations[ 1 ] = m_xAuthFallback.get( );
 
 setContinuations( aContinuations );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - uui/source

[Mihai Varga]

 uui/source/iahndl-authentication.cxx |   14 +-
 uui/source/iahndl.cxx|2 +-
 uui/source/iahndl.hxx|5 -
 3 files changed, 18 insertions(+), 3 deletions(-)

New commits:
commit 653851c1341d02f4047ef837485d58bf74f044eb
Author: Mihai Varga 
Date:   Mon Jun 30 20:24:49 2014 +0300

Request handlers

Change-Id: Id2180d7136ca6ff23de74fddae0d47720b518996

diff --git a/uui/source/iahndl-authentication.cxx 
b/uui/source/iahndl-authentication.cxx
index dff5bc8..b2876c4 100644
--- a/uui/source/iahndl-authentication.cxx
+++ b/uui/source/iahndl-authentication.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -747,11 +748,22 @@ UUIInteractionHelper::handlePasswordRequest(
 
 bool
 UUIInteractionHelper::handleAuthFallbackRequest( OUString & instructions,
-OUString & url )
+OUString & url,
+uno::Sequence< uno::Reference< task::XInteractionContinuation > > 
const & rContinuations )
 {
 Window * pParent = getParentProperty( );
 AuthFallbackDlg *dlg = new AuthFallbackDlg( pParent, instructions, url );
 int retCode = dlg->Execute( );
+uno::Reference< task::XInteractionAbort > xAbort;
+uno::Reference< ucb::XInteractionAuthFallback > xAuthFallback;
+getContinuations(rContinuations, &xAbort, &xAuthFallback);
+
+if( retCode == RET_OK && xAuthFallback.is( ) )
+{
+xAuthFallback->setCode( dlg->GetCode( ) );
+xAuthFallback->select( );
+}
+
 return true;
 }
 
diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx
index 8ca931a..48b5d66 100644
--- a/uui/source/iahndl.cxx
+++ b/uui/source/iahndl.cxx
@@ -832,7 +832,7 @@ UUIInteractionHelper::handleRequest_impl(
 if ( aAnyRequest >>= anAuthFallbackRequest )
 {
 handleAuthFallbackRequest( anAuthFallbackRequest.instructions,
-anAuthFallbackRequest.url );
+anAuthFallbackRequest.url, 
rRequest->getContinuations() );
 return true;
 }
 
diff --git a/uui/source/iahndl.hxx b/uui/source/iahndl.hxx
index ac211f9..43f700c 100644
--- a/uui/source/iahndl.hxx
+++ b/uui/source/iahndl.hxx
@@ -302,7 +302,10 @@ private:
 ) const;
 
 bool
-handleAuthFallbackRequest( OUString & instructions, OUString & url);
+handleAuthFallbackRequest(
+OUString & instructions,
+OUString & url,
+Continuations  const & rContinuations );
 };
 
 class ErrorResource: private Resource
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Icons/themes selection broken on 4.3.0.1

[Rene Engelhard]

Hi,

On Fri, Jun 27, 2014 at 12:13:50PM +0200, Regina Henschel wrote:
> Windows. Version 4.4 on Windows does not show that behavior. It

I can reproduce this in my 4.4 build,^ too (after deleting the
tango_testing I don't want but apparently is implicitly enabled..)
and thus just images.zip (galaxy) present.

Regards,

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

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

[Andras Timar]

 solenv/gbuild/platform/windows.mk |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9e69071b5942c5ba852e3b719ee9b3f3e859758d
Author: Andras Timar 
Date:   Mon Jun 30 10:23:31 2014 -0700

use VCL_HIDE_WINDOWS env on Windows, too

Change-Id: Ia313f82f75c1dfdb0952810056c6f17048658cee

diff --git a/solenv/gbuild/platform/windows.mk 
b/solenv/gbuild/platform/windows.mk
index 02428ca..a7ab73d 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -8,6 +8,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+# to avoid flashing windows during tests
+export VCL_HIDE_WINDOWS=1
+
 gb_LICENSE := license.txt
 gb_README = readme_$(1).txt
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-libcmis' - ucb/source

[Mihai Varga]

 ucb/source/ucp/cmis/auth_provider.cxx |   14 ++
 1 file changed, 14 insertions(+)

New commits:
commit 4a3d9636c7652626ab72b7592ae8ecf752038047
Author: Mihai Varga 
Date:   Mon Jun 30 20:32:04 2014 +0300

the fallback auth provider is set

Change-Id: I2c92a87d62b3583b0919b9397904a94c92ba7802

diff --git a/ucb/source/ucp/cmis/auth_provider.cxx 
b/ucb/source/ucp/cmis/auth_provider.cxx
index 9a5d2e9..d9e27c3 100644
--- a/ucb/source/ucp/cmis/auth_provider.cxx
+++ b/ucb/source/ucp/cmis/auth_provider.cxx
@@ -89,9 +89,23 @@ namespace cmis
 rtl::Reference< ucbhelper::AuthenticationFallbackRequest > 
xRequest
 = new ucbhelper::AuthenticationFallbackRequest (
 instructions, url_oustr );
+
 xIH->handle( xRequest.get() );
+
 rtl::Reference< ucbhelper::InteractionContinuation > xSelection
 = xRequest->getSelection();
+
+if ( xSelection.is() )
+{
+// Handler handled the request.
+const rtl::Reference< ucbhelper::InteractionAuthFallback >&
+xAuthFallback = xRequest->getAuthFallbackInter( );
+if ( xAuthFallback.is() )
+{
+OUString code = xAuthFallback->getCode( );
+return strdup( OUSTR_TO_STDSTR( code ).c_str( ) );
+}
+}
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 android/experimental/desktop/Makefile |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1e9b5f17f8ba551e40795392121a90075d804fcb
Author: Jan Holesovsky 
Date:   Mon Jun 30 19:34:57 2014 +0200

android: Add missing mkdir.

Change-Id: I9c06a1a2efcb3c436287a3aac15d976fcafbd19d

diff --git a/android/experimental/desktop/Makefile 
b/android/experimental/desktop/Makefile
index 2c30fc4..3a7f6ba 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -23,6 +23,7 @@ BOOTSTRAP=org.libreoffice.android.Bootstrap
 
 copy-stuff-desktop:
 # tango artwork / icons
+   mkdir -p assets/share/config
cp -R $(INSTDIR)/$(LIBO_SHARE_FOLDER)/config/images_tango.zip 
assets/share/config
 # shell / splash images
mkdir -p assets/program
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 svx/source/tbxctrls/lboxctrl.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8197a6c15f922b6c983bce12fa6ad259fc993e6e
Author: Miklos Vajna 
Date:   Mon Jun 30 19:41:14 2014 +0200

SvxPopupWindowListBox: avoid inheriting from boost::noncopyable two times

Change-Id: Ie74ceb4baf443dae5cfb524b2373dbebf3a8ab4e

diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx
index fdfbe9c..a6b2600 100644
--- a/svx/source/tbxctrls/lboxctrl.cxx
+++ b/svx/source/tbxctrls/lboxctrl.cxx
@@ -55,7 +55,7 @@ class SvxPopupWindowListBox;
 
 
 
-class SvxPopupWindowListBox: public SfxPopupWindow, private boost::noncopyable
+class SvxPopupWindowListBox: public SfxPopupWindow
 {
 using FloatingWindow::StateChanged;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sax/source/fastparser/fastparser.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 3ede68e1cc879e6adbf6336eccaf88ced974b8b6
Author: Kohei Yoshida 
Date:   Mon Jun 30 13:43:55 2014 -0400

Don't go further and pop the stack if it's empty.

Change-Id: I27bd30ca65cf0066cd022b4b060757913ea01fed

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 336f5ee..e8662b4 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -472,6 +472,12 @@ void Entity::characters( const OUString& sChars )
 
 void Entity::endElement()
 {
+if (maContextStack.empty())
+{
+// Malformed XML stream !?
+return;
+}
+
 const SaxContext& aContext = maContextStack.top();
 const Reference< XFastContextHandler >& xContext( aContext.mxContext );
 if( xContext.is() ) try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 chart2/source/controller/inc/dlg_CreationWizard.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e123226d874d59799ba4ca2a8919e50e7eb2ba3b
Author: Miklos Vajna 
Date:   Mon Jun 30 19:50:06 2014 +0200

CreationWizard already inherits boost::noncopyable via OutputDevice

Change-Id: Ie155742ea9fc29b5b1adfa219c0bc6fdd78cb637

diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx 
b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index 5aaff14..b81ae23 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -39,7 +39,7 @@ class DataSourceTabPage;
 class ChartTypeTemplateProvider;
 class DialogModel;
 
-class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable, 
private boost::noncopyable
+class CreationWizard : public svt::RoadmapWizard, public TabPageNotifiable
 {
 public:
 CreationWizard( Window* pParent,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 fpicker/source/office/iodlg.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 3828e942ebe4ab26cb5f074504f23587f43c1dd6
Author: Stephan Bergmann 
Date:   Mon Jun 30 19:55:09 2014 +0200

-Werror,-Wunused-macros

Change-Id: I04b79678a488d6dd954a339f678d56f978249b32

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 15ae59c..aa8b637 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -117,8 +117,6 @@ using namespace InternalFilePickerElementIds;
 // the browsebox gets filtered ( in ms).
 #define TRAVELFILTER_TIMEOUT750
 
-#define WIDTH_ADDITION  15
-
 // functions -
 
 namespace
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 sax/source/fastparser/fastparser.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 3f177756dbdb67d901453000c3f11694770d2761
Author: Kohei Yoshida 
Date:   Mon Jun 30 14:01:16 2014 -0400

Check for empty() before calling top().

Else it might crash sometimes.

Change-Id: I6a24fff83c3d36346debae5c0f2b8c0646a15c01

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index e8662b4..82378b1 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -660,6 +660,9 @@ sal_Int32 FastSaxParserImpl::GetTokenWithPrefix( const 
sal_Char*pPrefix, int nPr
 sal_Int32 nNamespaceToken = FastToken::DONTKNOW;
 
 Entity& rEntity = getEntity();
+if (rEntity.maNamespaceCount.empty())
+return nNamespaceToken;
+
 sal_uInt32 nNamespace = rEntity.maNamespaceCount.top();
 while( nNamespace-- )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - sax/source

[Kohei Yoshida]

 sax/source/fastparser/fastparser.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 313b2c4973a367c3c2ac3e0677e5166f4d6a2e85
Author: Kohei Yoshida 
Date:   Mon Jun 30 14:01:16 2014 -0400

Check for empty() before calling top().

Else it might crash sometimes.

Change-Id: I6a24fff83c3d36346debae5c0f2b8c0646a15c01
(cherry picked from commit 3f177756dbdb67d901453000c3f11694770d2761)

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index aa75513..4ddbd2a 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -688,6 +688,9 @@ sal_Int32 FastSaxParserImpl::GetTokenWithPrefix( const 
sal_Char*pPrefix, int nPr
 sal_Int32 nNamespaceToken = FastToken::DONTKNOW;
 
 Entity& rEntity = getEntity();
+if (rEntity.maNamespaceCount.empty())
+return nNamespaceToken;
+
 sal_uInt32 nNamespace = rEntity.maNamespaceCount.top();
 while( nNamespace-- )
 {
commit b8255bc0ac513af5d9bc7ae026caf885f71569c6
Author: Kohei Yoshida 
Date:   Mon Jun 30 13:43:55 2014 -0400

Don't go further and pop the stack if it's empty.

Change-Id: I27bd30ca65cf0066cd022b4b060757913ea01fed
(cherry picked from commit 3ede68e1cc879e6adbf6336eccaf88ced974b8b6)

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 0cfdb14..aa75513 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -492,6 +492,12 @@ void Entity::characters( const OUString& sChars )
 
 void Entity::endElement()
 {
+if (maContextStack.empty())
+{
+// Malformed XML stream !?
+return;
+}
+
 const SaxContext& aContext = maContextStack.top();
 const Reference< XFastContextHandler >& xContext( aContext.mxContext );
 if( xContext.is() ) try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 reportdesign/source/ui/dlg/AddField.cxx  |2 +-
 reportdesign/source/ui/dlg/GroupsSorting.cxx |1 -
 reportdesign/source/ui/dlg/Navigator.cxx |1 -
 reportdesign/source/ui/inc/CondFormat.hxx|1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 28177b61a843cab1094d04d189bb5fedcc6ea55a
Author: Miklos Vajna 
Date:   Mon Jun 30 20:35:47 2014 +0200

error: direct base 'boost::noncopyable' inaccessible due to ambiguity

Change-Id: I3d2d530ebdb3341956e9b7a3c1f22b621a52deff

diff --git a/reportdesign/source/ui/dlg/AddField.cxx 
b/reportdesign/source/ui/dlg/AddField.cxx
index 1b447be..5bea9c5 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -60,7 +60,7 @@ using namespace lang;
 using namespace container;
 using namespace ::svx;
 
-class OAddFieldWindowListBox: public SvTreeListBox, private boost::noncopyable
+class OAddFieldWindowListBox: public SvTreeListBox
 {
 OAddFieldWindow*m_pTabWin;
 
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx 
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 6a0a18c..9557309 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -82,7 +82,6 @@ typedef ::svt::EditBrowseBox OFieldExpressionControl_Base;
 typedef ::cppu::WeakImplHelper1< container::XContainerListener > 
TContainerListenerBase;
 class OFieldExpressionControl : public TContainerListenerBase
,public OFieldExpressionControl_Base
-   ,private boost::noncopyable
 {
 ::osl::Mutexm_aMutex;
 ::std::vectorm_aGroupPositions;
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx 
b/reportdesign/source/ui/dlg/Navigator.cxx
index 8d912fc..f89a445 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -111,7 +111,6 @@ class NavigatorTree :   public ::cppu::BaseMutex
 ,   public reportdesign::ITraverseReport
 ,   public comphelper::OSelectionChangeListener
 ,   public ::comphelper::OPropertyChangeListener
-,   private boost::noncopyable
 {
 class UserData;
 friend class UserData;
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx 
b/reportdesign/source/ui/inc/CondFormat.hxx
index 2a177e5..86b3d3c 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -68,7 +68,6 @@ namespace rptui
 \/
 class ConditionalFormattingDialog  :public ModalDialog
 ,public IConditionalFormatAction
-,private ::boost::noncopyable
 {
 typedef ::boost::shared_ptr< Condition >ConditionPtr;
 typedef ::std::vector< ConditionPtr >   Conditions;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSoC Refactor god objects weekly report

[V]

This week I finished refactoring IDocumentListsAccess, updated my branch 
to master and refactored IDocumentOutlineNodes. Also I started thinking 
about where the best place to manage SwDoc's SwNodes is as they are 
(using SwDoc::GetNodes()) used in many different places and it is not 
clear where they "belong".


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

[Libreoffice-commits] core.git: Branch 'feature/refactor-god-objects' - sw/inc sw/Library_sw.mk sw/source

[Valentin Kettner]

 sw/Library_sw.mk   |1 
 sw/inc/doc.hxx |   15 +---
 sw/source/core/doc/DocumentOutlineNodesManager.cxx |   76 +
 sw/source/core/doc/doc.cxx |   12 +++
 sw/source/core/doc/docnew.cxx  |2 
 sw/source/core/doc/docnum.cxx  |   41 ---
 sw/source/core/inc/DocumentOutlineNodesManager.hxx |   61 
 sw/source/core/text/EnhancedPDFExportHelper.cxx|1 
 sw/source/core/view/viewsh.cxx |3 
 sw/source/uibase/utlui/content.cxx |1 
 10 files changed, 161 insertions(+), 52 deletions(-)

New commits:
commit c0a5feffea7e8630ceb11eef261507be3f1fa622
Author: Valentin Kettner 
Date:   Mon Jun 30 20:58:00 2014 +0200

Refactored IDocumentOutlineNodes out of SwDoc.

Into the new class DocumentOutlineNodesManager.

Change-Id: I05581391a1474872113ae91d6429709d181cabfe

diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 855c17f..0f5d0a4 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -192,6 +192,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
 sw/source/core/doc/DocumentLinksAdministrationManager \
 sw/source/core/doc/DocumentListItemsManager \
 sw/source/core/doc/DocumentListsManager \
+sw/source/core/doc/DocumentOutlineNodesManager \
 sw/source/core/doc/extinput \
 sw/source/core/doc/fmtcol \
 sw/source/core/doc/ftnidx \
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 5d53f7a..ab74b4e 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -30,7 +30,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -193,6 +192,7 @@ class IDocumentTimerAccess;
 class IDocumentLinksAdministration;
 class IDocumentListItems;
 class IDocumentListsAccess;
+class IDocumentOutlineNodes;
 class _SetGetExpFlds;
 
 namespace sw { namespace mark {
@@ -210,6 +210,7 @@ namespace sw {
 class DocumentLinksAdministrationManager;
 class DocumentListItemsManager;
 class DocumentListsManager;
+class DocumentOutlineNodesManager;
 }
 
 namespace com { namespace sun { namespace star {
@@ -255,7 +256,6 @@ class SW_DLLPUBLIC SwDoc :
 public IDocumentStatistics,
 public IDocumentState,
 public IDocumentLayoutAccess,
-public IDocumentOutlineNodes,
 public IDocumentExternalData
 {
 
@@ -291,6 +291,7 @@ class SW_DLLPUBLIC SwDoc :
 const ::boost::scoped_ptr< ::sw::DocumentLinksAdministrationManager > 
m_pDocumentLinksAdministrationManager;
 const ::boost::scoped_ptr< ::sw::DocumentListItemsManager > 
m_pDocumentListItemsManager;
 const ::boost::scoped_ptr< ::sw::DocumentListsManager > 
m_pDocumentListsManager;
+const ::boost::scoped_ptr< ::sw::DocumentOutlineNodesManager > 
m_pDocumentOutlineNodesManager;
 
 // Pointer
 SwFrmFmt*mpDfltFrmFmt;   //< Default formats.
@@ -763,14 +764,8 @@ public:
 IDocumentListItems & getIDocumentListItems();
 
 // IDocumentOutlineNodes
-virtual sal_Int32 getOutlineNodesCount() const SAL_OVERRIDE;
-virtual int getOutlineLevel( const sal_Int32 nIdx ) const SAL_OVERRIDE;
-virtual OUString getOutlineText( const sal_Int32 nIdx,
-   const bool bWithNumber,
-   const bool bWithSpacesForLevel,
-   const bool bWithFtn ) const SAL_OVERRIDE;
-virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const 
SAL_OVERRIDE;
-virtual void getOutlineNodes( 
IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const 
SAL_OVERRIDE;
+IDocumentOutlineNodes const & getIDocumentOutlineNodes() const;
+IDocumentOutlineNodes & getIDocumentOutlineNodes();
 
 // IDocumentListsAccess
 IDocumentListsAccess const & getIDocumentListsAccess() const;
diff --git a/sw/source/core/doc/DocumentOutlineNodesManager.cxx 
b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
new file mode 100644
index 000..a967b90
--- /dev/null
+++ b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ 

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

[Stephan Bergmann]

 fpicker/source/office/iodlg.cxx |   63 
 fpicker/source/office/iodlg.hxx |4 --
 2 files changed, 67 deletions(-)

New commits:
commit 656dd07d298b8a8a9f3db69cc2b44779dde664db
Author: Stephan Bergmann 
Date:   Mon Jun 30 21:00:59 2014 +0200

Dead code

Change-Id: I50b13e27501dfd885e3ed99215d18166d5112bf7

diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index aa8b637..5f6be1f 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -187,27 +187,6 @@ namespace
 rFile += rExtension;
 }
 
-
-// move the control with the given offset
-void lcl_MoveControl( Control* _pControl, sal_Int32 _nDeltaX, sal_Int32 
_nDeltaY, sal_Int32* _pMaxY = NULL )
-{
-if ( _pControl )
-{
-Point aNewPos = _pControl->GetPosPixel();
-
-// adjust the vertical position
-aNewPos.Y() += _nDeltaY;
-if ( _pMaxY && ( aNewPos.Y() > *_pMaxY ) )
-*_pMaxY = aNewPos.Y();
-
-// adjust the horizontal position
-aNewPos.X() += _nDeltaX;
-
-_pControl->SetPosPixel( aNewPos );
-}
-}
-
-
 void lcl_autoUpdateFileExtension( SvtFileDialog* _pDialog, const OUString& 
_rLastFilterExt )
 {
 // if auto extension is enabled 
@@ -319,45 +298,6 @@ namespace
 }
 }
 
-
-// ControlChain_Impl
-
-
-struct ControlChain_Impl
-{
-Window*_pControl;
-ControlChain_Impl* _pNext;
-bool   _bHasOwnership;
-
-ControlChain_Impl( Window* pControl, ControlChain_Impl* pNext );
-~ControlChain_Impl();
-};
-
-
-
-ControlChain_Impl::ControlChain_Impl
-(
-Window* pControl,
-ControlChain_Impl* pNext
-)
-: _pControl( pControl ),
-  _pNext( pNext ),
-  _bHasOwnership( true )
-{
-}
-
-
-
-ControlChain_Impl::~ControlChain_Impl()
-{
-if ( _bHasOwnership )
-{
-delete _pControl;
-}
-delete _pNext;
-}
-
-
 // SvtFileDialog
 
 SvtFileDialog::SvtFileDialog
@@ -368,7 +308,6 @@ SvtFileDialog::SvtFileDialog
 ) :
 ModalDialog( _pParent, "ExplorerFileDialog", 
"fps/ui/explorerfiledialog.ui" )
 
-,_pUserControls( NULL )
 ,_pCbReadOnly( NULL )
 ,_pCbLinkBox( NULL)
 ,_pCbPreviewBox( NULL )
@@ -392,7 +331,6 @@ SvtFileDialog::SvtFileDialog
 
 SvtFileDialog::SvtFileDialog ( Window* _pParent, WinBits nBits )
 :ModalDialog( _pParent, "ExplorerFileDialog", 
"fps/ui/explorerfiledialog.ui" )
-,_pUserControls( NULL )
 ,_pCbReadOnly( NULL )
 ,_pCbLinkBox( NULL)
 ,_pCbPreviewBox( NULL )
@@ -501,7 +439,6 @@ SvtFileDialog::~SvtFileDialog()
 delete _pSplitter;
 delete _pContainer;
 delete _pPrevBmp;
-delete _pUserControls;
 }
 
 void SvtFileDialog::Init_Impl
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index 4984321..4a217c0 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -48,7 +48,6 @@
 
 class SvTabListBox;
 class SvtFileView;
-struct ControlChain_Impl;
 class SvtFileDialogFilter_Impl;
 
 
@@ -85,9 +84,6 @@ class CustomContainer;
 class SvtFileDialog : public ModalDialog, public ::svt::IFilePickerController
 {
 private:
-// originally from VclFileDialog
-ControlChain_Impl*  _pUserControls;
-
 CheckBox*   _pCbReadOnly;
 CheckBox*   _pCbLinkBox;
 CheckBox*   _pCbPreviewBox;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Dialog Widget Conversion - Week 6

[Mihály Palenik]

Hello,

In the last week I had my BSc's final exam that's why unfortunately I
didn't work.

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

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

[Stephan Bergmann]

 sw/source/ui/frmdlg/frmpage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77c5da90a6bd20f420107f767bc9e297ac9d9cfc
Author: Stephan Bergmann 
Date:   Mon Jun 30 21:59:34 2014 +0200

loplugin:literaltoboolconversion

Change-Id: I8a08580ad5cac4836a6dae5c842bd821e90bf546

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 3197345..c866f52 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2607,7 +2607,7 @@ BmpWindow::BmpWindow(Window* pPar, WinBits nStyle)
 , bLeftAlign(false)
 {
 SetBackground();
-SetPaintTransparent(sal_True);
+SetPaintTransparent(true);
 // #i119307# the graphic might have transparency, set up white as the color
 // to use when drawing a rectangle under the image
 SetLineColor(COL_WHITE);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Julien Nabet]

 dbaccess/source/core/dataaccess/documentdefinition.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 501ebd0f7c867c4df5ba84fd8b6b1a197aeeea92
Author: Julien Nabet 
Date:   Mon Jun 30 23:27:34 2014 +0200

Resolves fdo#43277  Send Legacy Report "E-Mail as ..."=>error message

Change-Id: Iaaadd4fd3015214c007a86d1a83f837aa0d2bdb6

diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx 
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index a6ec586..660d927 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -931,7 +931,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& 
_rOpenArgument, cons
 if ( m_bForm )
 xModule->setIdentifier( "com.sun.star.sdb.FormDesign" );
 else if ( !xReportDefinition.is() )
-xModule->setIdentifier( "com.sun.star.sdb.TextReportDesign" );
+xModule->setIdentifier( "com.sun.star.text.TextDocument" );
 
 updateDocumentTitle();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/source/core/frmedt/tblsel.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2c157249207552e193e52f5ab7fad5b37ae0a748
Author: Michael Stahl 
Date:   Mon Jun 30 23:22:10 2014 +0200

fdo#80663: sw: fix crash on Undo of table row/column delete

The _FndBox appears to handle an empty table lines vector, but evidently
it does not check its indexes properly in this case, which crashes with
STL containers.

(regression from bc0c939270a45469b8f22008288b5e4a4d9c9861)

Change-Id: Id864ea12bc97e61c5251f470e446b6b8f69cb054

diff --git a/sw/source/core/frmedt/tblsel.cxx b/sw/source/core/frmedt/tblsel.cxx
index e69b80f..8aa024e 100644
--- a/sw/source/core/frmedt/tblsel.cxx
+++ b/sw/source/core/frmedt/tblsel.cxx
@@ -2110,7 +2110,7 @@ void _FndBox::SetTableLines( const SwSelBoxes &rBoxes, 
const SwTable &rTable )
 if( nEndPos < nPos )
 nEndPos = nPos;
 }
-if ( nStPos > 1 )
+if (USHRT_MAX != nStPos && nStPos > 1)
 pLineBefore = rTable.GetTabLines()[nStPos - 2];
 if ( nEndPos < rTable.GetTabLines().size() )
 pLineBehind = rTable.GetTabLines()[nEndPos];
@@ -2173,7 +2173,8 @@ void _FndBox::DelFrms( SwTable &rTable, bool 
bAccTableDispose )
 nEndPos = rTable.GetTabLines().GetPos(
 (const SwTableLine*&)pLineBehind );
 OSL_ENSURE( nEndPos != USHRT_MAX, "The fox stole the line!" );
---nEndPos;
+if (nEndPos != 0)
+--nEndPos;
 }
 
 for ( sal_uInt16 i = nStPos; i <= nEndPos; ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[László Németh]

 i18npool/source/breakiterator/breakiterator_unicode.cxx |   22 +---
 1 file changed, 19 insertions(+), 3 deletions(-)

New commits:
commit 712d60f03d4c7dfa1ec56e49f40036ab7eb25fde
Author: László Németh 
Date:   Tue Jul 1 00:18:13 2014 +0200

fdo#79372, fdo#56392 fix hyphenation

Change-Id: Iacf84d023d3b4795892bc444299a29bfc663345e

diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 126ac7a..5270b1d 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -398,7 +398,7 @@ LineBreakResults SAL_CALL 
BreakIterator_Unicode::getLineBreak(
 uno::Reference< linguistic2::XHyphenatedWord > aHyphenatedWord;
 aHyphenatedWord = 
hOptions.rHyphenator->hyphenate(Text.copy(wBoundary.startPos,
 wBoundary.endPos - wBoundary.startPos), rLocale,
-(sal_Int16) (hOptions.hyphenIndex - wBoundary.startPos - 
nStartPosWordEnd), hOptions.aHyphenationOptions);
+(sal_Int16) (hOptions.hyphenIndex - wBoundary.startPos - 
((hOptions.hyphenIndex == wBoundary.endPos)? nStartPosWordEnd : 0)), 
hOptions.aHyphenationOptions);
 if (aHyphenatedWord.is()) {
 lbr.rHyphenatedWord = aHyphenatedWord;
 if(wBoundary.startPos + aHyphenatedWord->getHyphenationPos() + 
1 < nMinBreakPos )
commit c78d948b6113e3c3b38d8a0b5206155c4c3a13e4
Author: László Németh 
Date:   Tue Jul 1 00:15:11 2014 +0200

Revert "fdo#79372 fix hyphenation (remove fdo#56392 fix, except hard hyphen 
part)"

This reverts commit 259d3421d4cf7788d9099daa40fc181c661783ee.

diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index b491181..126ac7a 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -376,13 +376,29 @@ LineBreakResults SAL_CALL 
BreakIterator_Unicode::getLineBreak(
 if (line.aBreakIterator->preceding(nStartPos + 1) == nStartPos) { 
//Line boundary break
 lbr.breakIndex = nStartPos;
 lbr.breakType = BreakType::WORDBOUNDARY;
-} else if (hOptions.rHyphenator.is()) { //Hyphenation break, FIXME: 
fdo#56392
-Boundary wBoundary = getWordBoundary( Text, nStartPos, rLocale,
+} else if (hOptions.rHyphenator.is()) { //Hyphenation break
+sal_Int32 boundary_with_punctuation = (line.aBreakIterator->next() 
!= BreakIterator::DONE) ? line.aBreakIterator->current() : 0;
+line.aBreakIterator->preceding(nStartPos + 1); // reset to check 
correct hyphenation of "word-word"
+
+sal_Int32 nStartPosWordEnd = nStartPos;
+while (line.aBreakIterator->current() < nStartPosWordEnd && 
u_ispunct((sal_uInt32)Text[nStartPosWordEnd])) // starting punctuation
+nStartPosWordEnd --;
+
+Boundary wBoundary = getWordBoundary( Text, nStartPosWordEnd, 
rLocale,
 WordType::DICTIONARY_WORD, false);
+
+nStartPosWordEnd = wBoundary.endPos;
+while (nStartPosWordEnd < Text.getLength() && 
(u_ispunct((sal_uInt32)Text[nStartPosWordEnd]))) // ending punctuation
+nStartPosWordEnd ++;
+nStartPosWordEnd = nStartPosWordEnd - wBoundary.endPos;
+if (hOptions.hyphenIndex - wBoundary.startPos < nStartPosWordEnd) 
nStartPosWordEnd = hOptions.hyphenIndex - wBoundary.startPos;
+#define SPACE 0x0020
+while (boundary_with_punctuation > wBoundary.endPos && 
Text[--boundary_with_punctuation] == SPACE);
+if (boundary_with_punctuation != 0) boundary_with_punctuation += 1 
- wBoundary.endPos;
 uno::Reference< linguistic2::XHyphenatedWord > aHyphenatedWord;
 aHyphenatedWord = 
hOptions.rHyphenator->hyphenate(Text.copy(wBoundary.startPos,
 wBoundary.endPos - wBoundary.startPos), rLocale,
-(sal_Int16) (hOptions.hyphenIndex - wBoundary.startPos), 
hOptions.aHyphenationOptions);
+(sal_Int16) (hOptions.hyphenIndex - wBoundary.startPos - 
nStartPosWordEnd), hOptions.aHyphenationOptions);
 if (aHyphenatedWord.is()) {
 lbr.rHyphenatedWord = aHyphenatedWord;
 if(wBoundary.startPos + aHyphenatedWord->getHyphenationPos() + 
1 < nMinBreakPos )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 56392, which changed state.

Bug 56392 Summary: Writer: hyphenation is not always used in line break 
algorithm
https://bugs.freedesktop.org/show_bug.cgi?id=56392

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

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

[Libreoffice-commits] core.git: oox/source sax/source

[Kohei Yoshida]

 oox/source/core/xmlfilterbase.cxx|6 +-
 sax/source/fastparser/fastparser.cxx |3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit dc93074f71f91efd8a615ad8f1a5289deb210b75
Author: Kohei Yoshida 
Date:   Mon Jun 30 20:03:28 2014 -0400

Use a new fast parser instance for each XML fragment.

Otherwise a crash ensues when the threaded XML parsing kicks in.

Change-Id: Ic41e5a29bbb860d7b63b70f2f0d8896264d9d53e

diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index 486946c..af0567b 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -171,6 +171,7 @@ struct XmlFilterBaseImpl
 {
 typedef RefMap< OUString, Relations > RelationsMap;
 
+Reference   mxContext;
 FastParser maFastParser;
 const OUString maBinSuffix;
 const OUString maVmlSuffix;
@@ -182,6 +183,7 @@ struct XmlFilterBaseImpl
 };
 
 XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& 
rxContext ) throw( RuntimeException ) :
+mxContext(rxContext),
 maFastParser( rxContext ),
 maBinSuffix( ".bin" ),
 maVmlSuffix( ".vml" )
@@ -272,7 +274,9 @@ OUString 
XmlFilterBase::getFragmentPathFromFirstTypeFromOfficeDoc( const OUStrin
 
 bool XmlFilterBase::importFragment( const rtl::Reference& 
rxHandler )
 {
-return importFragment(rxHandler, mxImpl->maFastParser);
+FastParser aParser(mxImpl->mxContext);
+registerNamespaces(aParser);
+return importFragment(rxHandler, aParser);
 }
 
 bool XmlFilterBase::importFragment( const rtl::Reference& 
rxHandler, FastParser& rParser )
diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 82378b1..17e0213 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -979,6 +979,9 @@ void FastSaxParserImpl::produce( CallbackType aType )
 
 bool FastSaxParserImpl::hasNamespaceURL( const OUString& rPrefix ) const
 {
+if (maEntities.empty())
+return false;
+
 const Entity& rEntity = getEntity();
 
 if (rEntity.maNamespaceCount.empty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - oox/source sax/source

[Kohei Yoshida]

 oox/source/core/xmlfilterbase.cxx|6 +-
 sax/source/fastparser/fastparser.cxx |3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit e95df2193f698dcda5616e5523eae4d4cbf76fc9
Author: Kohei Yoshida 
Date:   Mon Jun 30 20:03:28 2014 -0400

Use a new fast parser instance for each XML fragment.

Otherwise a crash ensues when the threaded XML parsing kicks in.

Change-Id: Ic41e5a29bbb860d7b63b70f2f0d8896264d9d53e
(cherry picked from commit dc93074f71f91efd8a615ad8f1a5289deb210b75)

diff --git a/oox/source/core/xmlfilterbase.cxx 
b/oox/source/core/xmlfilterbase.cxx
index cf996eb..1608aed 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -158,6 +158,7 @@ struct XmlFilterBaseImpl
 {
 typedef RefMap< OUString, Relations > RelationsMap;
 
+Reference   mxContext;
 FastParser maFastParser;
 const OUString maBinSuffix;
 const OUString maVmlSuffix;
@@ -170,6 +171,7 @@ struct XmlFilterBaseImpl
 
 
 XmlFilterBaseImpl::XmlFilterBaseImpl( const Reference< XComponentContext >& 
rxContext ) throw( RuntimeException ) :
+mxContext(rxContext),
 maFastParser( rxContext ),
 maBinSuffix( ".bin" ),
 maVmlSuffix( ".vml" )
@@ -268,7 +270,9 @@ OUString 
XmlFilterBase::getFragmentPathFromFirstTypeFromOfficeDoc( const OUStrin
 
 bool XmlFilterBase::importFragment( const rtl::Reference& 
rxHandler )
 {
-return importFragment(rxHandler, mxImpl->maFastParser);
+FastParser aParser(mxImpl->mxContext);
+registerNamespaces(aParser);
+return importFragment(rxHandler, aParser);
 }
 
 bool XmlFilterBase::importFragment( const rtl::Reference& 
rxHandler, FastParser& rParser )
diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 4ddbd2a..e10ce3f 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -1042,6 +1042,9 @@ void FastSaxParserImpl::produce( CallbackType aType )
 
 bool FastSaxParserImpl::hasNamespaceURL( const OUString& rPrefix ) const
 {
+if (maEntities.empty())
+return false;
+
 const Entity& rEntity = getEntity();
 
 if (rEntity.maNamespaceCount.empty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSOC] Personas - Weekly Report #6

[Rachit Gupta]

Hello all,

This week, I accomplished the following things:

+ The personas can be installed through oxt extensions. I created a
template in the Common.xcs registry to include the Peronas details and
created a corresponding set.
Whenever an oxt is installed, the persona details are added to the set and
the installed themes are displayed in the Personalization tab for the user
to choose from.

For the coming week, I'll be focusing on:

- UI issues.
- Thread related bugs.

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

[Libreoffice-commits] core.git: sal/osl

[Jan Holesovsky]

 sal/osl/unx/file.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit c651bf90774eaa61352f72157621ee54558f624a
Author: Jan Holesovsky 
Date:   Tue Jul 1 07:53:06 2014 +0200

Actually not necessary to log this, it is already logged a bit later.

Change-Id: I30380b58b3141ac20e90e47a1538156b5b4dd08f

diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 092f0ffe..a7eaac1 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -827,8 +827,6 @@ openFilePath( const char *cpFilePath, oslFileHandle* 
pHandle, sal_uInt32 uFlags,
 oslFileError eRet;
 
 #ifdef ANDROID
-SAL_INFO("sal.file", "osl_openFile: " << cpFilePath);
-
 /* Opening a file from /assets read-only means
  * we should mmap it from the .apk file
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

LibreOffice Gerrit News for core on 2014-07-01

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ Convert DLG_COLLECTION_VIEW to .ui
  in https://gerrit.libreoffice.org/9981 from Mihály Palenik
  about module dbaccess, extras, include, svtools
+ fdo#54361:Add test case for the chart background
  in https://gerrit.libreoffice.org/9978 from Heena Gupta
  about module chart2
 End of freshness 

+ Build all l10n AutoText
  in https://gerrit.libreoffice.org/9954 from Laurent BP
  about module extras
+ drop UniReference in favour of rtl::Reference
  in https://gerrit.libreoffice.org/9977 from Noel Grandin
  about module dbaccess, editeng, filter, include, reportdesign, sc, sw, xmloff
+ Do not leave unreachable TableColumnUndo/TableRowUndo in case of exceptio
  in https://gerrit.libreoffice.org/9979 from Takeshi Abe
  about module svx


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

+ DLG_FPICKER_EXPLORERFILE conversion to .ui
  in https://gerrit.libreoffice.org/9951 from Szymon Kłos
+ fdo#80514 LO crashes on opening; tries to remove a para with NumPicBullet
  in https://gerrit.libreoffice.org/9897 from Vinaya Mandke
+ OS X: PYTHON_CFLAGS & PYTHON_LIBS (--enable-python=system)
  in https://gerrit.libreoffice.org/9926 from Robert Antoni Buj i Gelonch
+ use VCL_HIDE_WINDOWS env on Mac to 'simulate' headless mode on Mac
  in https://gerrit.libreoffice.org/9974 from Norbert Thiebaud
+ Translated German comments in filerec.hxx and doxygen-ify.
  in https://gerrit.libreoffice.org/9957 from Jeroen Nijhof
+ Translate German comments in filerec.cxx and doxygen-ify.
  in https://gerrit.libreoffice.org/9956 from Jeroen Nijhof
+ related fdo#70998 change names in Navigator to plural
  in https://gerrit.libreoffice.org/9942 from Stanislav Horáček
+ Remove double assignment
  in https://gerrit.libreoffice.org/9968 from Peter Senna Tschudin
+ Drop unecessary continue
  in https://gerrit.libreoffice.org/9969 from Peter Senna Tschudin
+ Revert "use bundled (non-system) versions of libxml2 and libxslt for OS X
  in https://gerrit.libreoffice.org/9958 from Douglas Mencken


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

+ Define DINDEX_PAGE_SIZE to PAGE_SIZE on FreeBSD
  in https://gerrit.libreoffice.org/9731 from Baptiste Daroussin


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

+ Replace the whole content for copied documents
  in https://gerrit.libreoffice.org/9862 from Jan-Marek Glogowski
+ fdo#79880: After RT document corrupted due to invalid hyperlink.
  in https://gerrit.libreoffice.org/9751 from Yogesh Bharate
+ fdo#78947 : The File gets corrupted when saved in LO
  in https://gerrit.libreoffice.org/9775 from BisalNayal
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ configure, gbuild: remove Cygwin paths from make environment
  in https://gerrit.libreoffice.org/9698 from Michael Stahl
+ sw/docx export: fix handling of document with header and section(s)
  in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ move OpenGLContext to SAL
  in https://gerrit.libreoffice.org/9429 from David Tardon
+ Changes for Wordml
  in https://gerrit.libreoffice.org/9013 from Michel Messak
+ fdo#64945 Remove inconvenient localized symbol code.
  in https://gerrit.libreoffice.org/8696 from Darshana Padmadas
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ Lots of changes to Tango icons
  in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ Refactored swooxmlexport tests cases. Added function to check contents.
  in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


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

LibreOffice Gerrit News for submodules on 2014-07-01

[gerrit]

Moin!



~~ Project dictionaries ~~

Nothing moved in the project for the last 25 hours

~~ Project translations ~~

Nothing moved in the project for the last 25 hours

~~ Project help ~~

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

None

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

+ Fix fdo#80446: Help entries for BETA.DIST BETA.INV
  in https://gerrit.libreoffice.org/9961 from Olivier Hallot
+ Fix fdo#80656. Help for NUMBERVALUE Calc function
  in https://gerrit.libreoffice.org/9959 from Olivier Hallot
+ Fix fdo#80442, Calc DBCS functions
  in https://gerrit.libreoffice.org/9970 from Olivier Hallot
+ Fix fdo#80438: help entries of Excel new functions
  in https://gerrit.libreoffice.org/9948 from Olivier Hallot


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

None

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

None

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

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

[Miklos Vajna]

 editeng/source/editeng/editdbg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 88bd199e761a165b8add0cebac9f149dc4250829
Author: Miklos Vajna 
Date:   Tue Jul 1 08:07:37 2014 +0200

error: 'SvxColorBackgroundItem' was not declared in this scope

Change-Id: I296a1ba4128d5e1c9178a20df25875fd8baaefe5

diff --git a/editeng/source/editeng/editdbg.cxx 
b/editeng/source/editeng/editdbg.cxx
index 4e4f55b..8703a6a 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -180,7 +180,7 @@ OString DbgOutItem(const SfxItemPool& rPool, const 
SfxPoolItem& rItem)
 case EE_CHAR_BKGCOLOR:
 {
 aDebStr.append("FillColor= ");
-Color aColor( ((SvxColorBackgroundItem&)rItem).GetValue() );
+Color aColor( ((SvxBackgroundColorItem&)rItem).GetValue() );
 aDebStr.append(static_cast(aColor.GetRed()));
 aDebStr.append(", ");
 aDebStr.append(static_cast(aColor.GetGreen()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits