Re: [patch] [solved] build failure
Silly me, I should have waited before sending the last message. Or I
should have checked commit cbd4986.
On Tue, 2014-05-06 at 01:54 -0400, Terrence Enger wrote:
> gcc (Debian 4.7.2-5) 4.7.2 on debian-wheezy just choked on
> sfx2/source/control/querystatus.cxx ...
And exactly similar errors with exactly the same fix:
sfx2/source/statbar/stbitem.cxx
sfx2/source/toolbox/tbxitem.cxx
The attached patch fixes all three files. I.e., it repeats the change
attached to my previous e-mail.
Terry.
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index f9fa487..04e91f0 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -135,14 +135,14 @@ throw( RuntimeException, std::exception )
rEvent.State >>= sTemp ;
m_pItem = new SfxStringItem( m_nSlotID, sTemp );
}
-else if ( pType == cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus>::get() )
{
ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
m_eState = aItemStatus.State;
m_pItem = new SfxVoidItem( m_nSlotID );
}
-else if ( pType == cppu::UnoType<::com::sun::star::frame::status::Visibility>::get() )
+else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::Visibility>::get() )
{
Visibility aVisibilityStatus;
rEvent.State >>= aVisibilityStatus;
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 549b46f..df13974 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -286,7 +286,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
rEvent.State >>= sTemp ;
pItem = new SfxStringItem( nSlotID, sTemp );
}
-else if ( pType == cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus>::get() )
{
frame::status::ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index bb1be33..2b4efb0 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -565,14 +565,14 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
rEvent.State >>= sTemp ;
pItem = new SfxStringItem( nSlotId, sTemp );
}
-else if ( pType == cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus>::get() )
{
ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
eState = aItemStatus.State;
pItem = new SfxVoidItem( nSlotId );
}
-else if ( pType == cppu::UnoType<::com::sun::star::frame::status::Visibility>::get() )
+else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::Visibility>::get() )
{
Visibility aVisibilityStatus;
rEvent.State >>= aVisibilityStatus;
@@ -,14 +,14 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception )
rEvent.State >>= sTemp ;
pItem = new SfxStringItem( nSlotId, sTemp );
}
-else if ( pType == cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus>::get() )
{
ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
eState = aItemStatus.State;
pItem = new SfxVoidItem( nSlotId );
}
-else if ( pType == cppu::UnoType<::com::sun::star::frame::status::Visibility>::get() )
+else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::Visibility>::get() )
{
Visibility aVisibilityStatus;
rEvent.State >>= aVisibilityStatus;
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/inc sc/source
sc/inc/document.hxx |9 +
sc/source/core/data/document.cxx | 20 +++-
sc/source/ui/app/transobj.cxx|2 +-
3 files changed, 21 insertions(+), 10 deletions(-)
New commits:
commit b26b9606efa30c0a44e20dcf638fbd1e27f05089
Author: Kohei Yoshida
Date: Mon May 5 15:22:15 2014 -0400
fdo#78054: Initialize drawing layer when the document contains notes.
Don't be fooled even when the document doesn't have a drawing layer
initialized. Sometimes a note creates caption on demand later, but if
the drawing layer isn't there the caption will not get created, which
ultimately causes this crash.
(cherry picked from commit fe451fb94a33c914c0a7c1265c013d9704af850a)
Conflicts:
sc/inc/document.hxx
Change-Id: I37f4902fa84de91c9f793dc352127d9345a725e3
Reviewed-on: https://gerrit.libreoffice.org/9254
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 365cffd..339bbb0 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -919,10 +919,11 @@ public:
SC_DLLPUBLIC ScPostIt* GetNote(SCCOL nCol, SCROW nRow, SCTAB nTab);
void SetNote(const ScAddress& rPos, ScPostIt*
pNote);
void SetNote(SCCOL nCol, SCROW nRow, SCTAB nTab,
ScPostIt* pNote);
-bool HasNote(const ScAddress& rPos);
-bool HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab);
-SC_DLLPUBLIC boolHasColNotes(SCCOL nCol, SCTAB nTab);
-SC_DLLPUBLIC boolHasTabNotes(SCTAB nTab);
+bool HasNote(const ScAddress& rPos) const;
+bool HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab)
const;
+SC_DLLPUBLIC boolHasColNotes(SCCOL nCol, SCTAB nTab) const;
+SC_DLLPUBLIC boolHasTabNotes(SCTAB nTab) const;
+bool HasNotes() const;
SC_DLLPUBLIC ScPostIt* ReleaseNote(const ScAddress& rPos);
SC_DLLPUBLIC ScPostIt* GetOrCreateNote(const ScAddress& rPos);
SC_DLLPUBLIC ScPostIt* CreateNote(const ScAddress& rPos);
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index bc66735..8c69412 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6109,21 +6109,21 @@ void ScDocument::SetNote(SCCOL nCol, SCROW nRow, SCTAB
nTab, ScPostIt* pNote)
return maTabs[nTab]->aCol[nCol].SetCellNote(nRow, pNote);
}
-bool ScDocument::HasNote(const ScAddress& rPos)
+bool ScDocument::HasNote(const ScAddress& rPos) const
{
return HasNote(rPos.Col(), rPos.Row(), rPos.Tab());
}
-bool ScDocument::HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab)
+bool ScDocument::HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab) const
{
-ScPostIt* pNote = maTabs[nTab]->aCol[nCol].GetCellNote(nRow);
+const ScPostIt* pNote = maTabs[nTab]->aCol[nCol].GetCellNote(nRow);
return pNote != NULL;
}
-bool ScDocument::HasColNotes(SCCOL nCol, SCTAB nTab)
+bool ScDocument::HasColNotes(SCCOL nCol, SCTAB nTab) const
{
return maTabs[nTab]->aCol[nCol].HasCellNotes();
}
-bool ScDocument::HasTabNotes(SCTAB nTab)
+bool ScDocument::HasTabNotes(SCTAB nTab) const
{
bool hasNotes = false;
for (SCCOL nCol=0; nColGetDrawLayer() )
+if (pDoc->GetDrawLayer() || pDoc->HasNotes())
pDocSh->MakeDrawLayer();
// cell range is copied to the original position, but on the first
sheet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
QA Meeting Minutes 2014-05-05
Hi all, We had a great QA Meeting today; it was great to hear from both new and long-term contributors on the call! Meeting agenda and minutes are available on the meeting page: https://wiki.documentfoundation.org/QA/Meetings/2014/May_05 Our next meeting is (tentatively) scheduled for May 19th, but may be re-scheduled to make sure that more contributors may attend. For the agenda of the next meeting, see: https://wiki.documentfoundation.org/QA/Meetings/2014/May_19 Cheers, --R -- Robinson Tryon LibreOffice Community Outreach Herald Senior QA Bug Wrangler The Document Foundation qu...@libreoffice.org ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/inc/GL3DRenderer.hxx |3 +
chart2/source/view/main/GL3DRenderer.cxx | 68 +--
2 files changed, 68 insertions(+), 3 deletions(-)
New commits:
commit 7ac9f37ebfab959e51c0012d1fcc3fba2db1cd15
Author: Markus Mohrhard
Date: Tue May 6 07:56:48 2014 +0200
add some missing pieces from the 2D renderer to the 3D one
Change-Id: I9933a429f42f8a350a88aa77514f934560ed58f3
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx
b/chart2/source/view/inc/GL3DRenderer.hxx
index 8ae30b1..0d4fcd0 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -169,6 +169,9 @@ class OpenGL3DRenderer : public IOpenGLInfoProvider
public:
OpenGL3DRenderer();
+void CreateFrameBufferObj();
+void CreateTextureObj(int,int);
+void CreateRenderObj(int, int);
void LoadShaders();
void init();
virtual bool isOpenGLInitialized() SAL_OVERRIDE;
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
index 3197c56..54f5e3d 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -119,6 +119,67 @@ void OpenGL3DRenderer::LoadShaders()
m_TextVertexID = glGetAttribLocation(m_TextProID, "vPosition");
m_TextTexCoordID = glGetAttribLocation(m_TextProID, "texCoord");
m_TextTexID = glGetUniformLocation(m_TextProID, "TextTex");
+
+m_CommonProID = OpenGLHelper::LoadShaders("commonVertexShader",
"commonFragmentShader");
+m_MatrixID = glGetUniformLocation(m_CommonProID, "MVP");
+m_2DVertexID = glGetAttribLocation(m_CommonProID, "vPosition");
+m_2DColorID = glGetUniformLocation(m_CommonProID, "vColor");
+CHECK_GL_ERROR();
+}
+
+void OpenGL3DRenderer::CreateTextureObj(int width, int height)
+{
+glGenTextures(2, m_TextureObj);
+for (int i = 0; i < 2; i++)
+{
+glBindTexture(GL_TEXTURE_2D, m_TextureObj[i]);
+glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
+glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA,
GL_UNSIGNED_BYTE, NULL);
+CHECK_GL_ERROR();
+glBindTexture(GL_TEXTURE_2D, 0);
+}
+}
+
+void OpenGL3DRenderer::CreateRenderObj(int width, int height)
+{
+glGenRenderbuffers(2, m_RboID);
+for (int i = 0; i < 2; i++)
+{
+CHECK_GL_ERROR();
+glBindRenderbuffer(GL_RENDERBUFFER, m_RboID[i]);
+CHECK_GL_ERROR();
+glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, width,
height);
+CHECK_GL_ERROR();
+glBindRenderbuffer(GL_RENDERBUFFER, 0);
+CHECK_GL_ERROR();
+}
+}
+
+void OpenGL3DRenderer::CreateFrameBufferObj()
+{
+CreateTextureObj(m_iWidth, m_iHeight);
+CreateRenderObj(m_iWidth, m_iHeight);
+// create a framebuffer object, you need to delete them when program exits.
+glGenFramebuffers(2, m_FboID);
+glCheckFramebufferStatus(GL_FRAMEBUFFER);
+for (int i = 0; i < 2; i++)
+{
+glBindFramebuffer(GL_FRAMEBUFFER, m_FboID[i]);
+glBindTexture(GL_TEXTURE_2D, m_TextureObj[i]);
+// attach a texture to FBO color attachement point
+glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D, m_TextureObj[i], 0);
+glCheckFramebufferStatus(GL_FRAMEBUFFER);
+glBindTexture(GL_TEXTURE_2D, 0);
+// attach a renderbuffer to depth attachment point
+glBindRenderbuffer(GL_RENDERBUFFER, m_RboID[i]);
+glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
GL_RENDERBUFFER, m_RboID[i]);
+glCheckFramebufferStatus(GL_FRAMEBUFFER);
+glBindRenderbuffer(GL_RENDERBUFFER, 0);
+glBindFramebuffer(GL_FRAMEBUFFER, m_FboID[0]);
+}
}
void OpenGL3DRenderer::SetCameraInfo(glm::vec3 pos, glm::vec3 direction,
glm::vec3 up, bool useDefalut)
@@ -163,6 +224,8 @@ void OpenGL3DRenderer::init()
glClearDepth(1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+CreateFrameBufferObj();
+
glGenBuffers(1, &m_CubeVertexBuf);
glGenBuffers(1, &m_CubeNormalBuf);
glGenBuffers(1, &m_CubeElementBuf);
@@ -1440,7 +1503,7 @@ sal_uInt32 OpenGL3DRenderer::GetIndexByColor(sal_uInt32
r, sal_uInt32 g, sal_uIn
void OpenGL3DRenderer::ProcessPickingBox()
{
glViewport(0, 0, m_iWidth, m_iHeight);
-glBindFramebuffer(GL_FRAMEBUFFER, m_FboID[1]);
+glBindFramebuffer(GL_FRAMEBUFFER, m_FboID[0]);
glClearDepth(1.0f);
glClearColor(1.0, 1.0, 1.0, 1.0);
if(ProcessExtrude3DPickingBox() == 1)
@@ -1448,7 +1511,7 @@ void OpenGL3DRenderer::ProcessPickingBox()
//the picked object has been processed, return
return ;
}
-glBindFramebuffer(GL_FRAMEBUFFER, 0);
+glB
LibreOffice Gerrit News for core on 2014-05-06
Moin!
* Open changes on master for project core changed in the last 25 hours:
First time contributors doing great things!
+ fdo#77887 : Floating Table positions are not preserved when doing Export
in https://gerrit.libreoffice.org/9185 from Ravindra Vidhate
about module sw, writerfilter
End of freshness
+ fdo#43157 [API CHANGE] Remove OSL_POSTCOND, prefer SAL_WARN_IF
in https://gerrit.libreoffice.org/8883 from Michaël Lefèvre
about module basic, dbaccess, fpicker, include, sal, shell, store
+ fdo#78284 Content-type of ".png" images in Smart Art
in https://gerrit.libreoffice.org/9252 from Vinaya Mandke
about module sw
+ RFC: add IsValueChangedFromSaved to VCL button and listbox
in https://gerrit.libreoffice.org/9250 from Noel Grandin
about module forms, include, reportdesign, vcl
* Merged changes on master for project core changed in the last 25 hours:
+ Asan: fix invalid memory access
in https://gerrit.libreoffice.org/9249 from Markus Mohrhard
+ fix windows build(external/poppler)
in https://gerrit.libreoffice.org/9248 from Tomofumi Yagi
+ fdo#77727 PAGEBREAK In first paragraph was not rendered and exported.
in https://gerrit.libreoffice.org/9191 from Sushil Shinde
* Abandoned changes on master for project core changed in the last 25 hours:
None
* Open changes needing tweaks, but being untouched for more than a week:
+ external: revert java 1.6 stuff (at least until we'd get a real check in
in https://gerrit.libreoffice.org/8801 from Douglas Mencken
+ cppunittest_filter_xslt: fix fdo#77893
in https://gerrit.libreoffice.org/9177 from Douglas Mencken
+ DrawWaveLine/ImplDrawWaveLine fixes: - try to avoid huge looping due to
in https://gerrit.libreoffice.org/9174 from Douglas Mencken
+ FDO#74886: Data labels are not preserved for Column Chart in RT file
in https://gerrit.libreoffice.org/8098 from Umesh Kadam
+ move inettype.{hc}xx from svl to tools
in https://gerrit.libreoffice.org/8926 from Christina Roßmanith
+ new method INetURLObject::getData() for data urls
in https://gerrit.libreoffice.org/8737 from Christina Roßmanith
+ fdo#67544 Slide transistion sound(other sound) is not included in present
in https://gerrit.libreoffice.org/8700 from Vishv Brahmbhatt
+ fdo#57950: Replace chained O(U)StringBuffer::append() with operator+
in https://gerrit.libreoffice.org/8699 from Tharindu Lakmal
+ Refactored
in https://gerrit.libreoffice.org/8683 from Tharindu Lakmal
+ fdo#75757 Remove inheritance to std::map from PropertyMap
in https://gerrit.libreoffice.org/8656 from Krisztian Pinter
+ Remove visual noise from ios
in https://gerrit.libreoffice.org/8274 from Alexander Wilms
+ FDO#75205 : Charts - Up Down bars are getting added to Line Chart.
in https://gerrit.libreoffice.org/8360 from Umesh Kadam
+ WIP: Converting ExtensionUpdate dialog for new format
in https://gerrit.libreoffice.org/8506 from Rodolfo Ribeiro Gomes
+ Refactored swooxmlexport tests cases. Added function to check contents.
in https://gerrit.libreoffice.org/8390 from Nikhil Walvekar
+ fdo#71984 fix first line indentation in footnotes for MS Word documents
in https://gerrit.libreoffice.org/8160 from Andras Timar
+ Lots of changes to Tango icons
in https://gerrit.libreoffice.org/7987 from Miroslav Mazel
+ sw/docx export: fix handling of document with header and section(s)
in https://gerrit.libreoffice.org/6248 from Pierre-Eric Pelloux-Prayer
+ fdo#51525 Fix duplicate "Paste Special" entries in Calc.
in https://gerrit.libreoffice.org/7784 from Andrzej Hunt
+ fdo#72661: Check ‘Hyphenation active’ automatically
in https://gerrit.libreoffice.org/7291 from Jiwoong Youn
+ WIP fdo#72987 Use firebird backup format for .odb
in https://gerrit.libreoffice.org/7299 from Andrzej Hunt
+ WIP: fdo#33980 Preserve selection across all slide sorters.
in https://gerrit.libreoffice.org/6633 from Andrzej Hunt
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
[patch] [solved] build failure
gcc (Debian 4.7.2-5) 4.7.2 on debian-wheezy just choked on
sfx2/source/control/querystatus.cxx ...
/home/terry/lo_hacking/git/libo2/sfx2/source/control/querystatus.cxx: In
member function ‘virtual void SfxQueryStatus_Impl::statusChanged(const
com::sun::star::frame::FeatureStateEvent&)’:
/home/terry/lo_hacking/git/libo2/sfx2/source/control/querystatus.cxx:138:41:
error: ‘<::’ cannot begin a template-argument list [-fpermissive]
/home/terry/lo_hacking/git/libo2/sfx2/source/control/querystatus.cxx:138:41:
note: ‘<:’ is an alternate spelling for ‘[’. Insert whitespace between ‘<’ and
‘::’
/home/terry/lo_hacking/git/libo2/sfx2/source/control/querystatus.cxx:138:41:
note: (if you use ‘-fpermissive’ G++ will accept your code)
/home/terry/lo_hacking/git/libo2/sfx2/source/control/querystatus.cxx:145:41:
error: ‘<::’ cannot begin a template-argument list [-fpermissive]
/home/terry/lo_hacking/git/libo2/sfx2/source/control/querystatus.cxx:145:41:
note: ‘<:’ is an alternate spelling for ‘[’. Insert whitespace between ‘<’ and
‘::’
Wow, aren't triglyphs fun? It is years since I last thought about
them.
With the change as per attached diff, the build is continuing.
HTH,
Terry
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index f9fa487..04e91f0 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -135,14 +135,14 @@ throw( RuntimeException, std::exception )
rEvent.State >>= sTemp ;
m_pItem = new SfxStringItem( m_nSlotID, sTemp );
}
-else if ( pType == cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::ItemStatus>::get() )
{
ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
m_eState = aItemStatus.State;
m_pItem = new SfxVoidItem( m_nSlotID );
}
-else if ( pType == cppu::UnoType<::com::sun::star::frame::status::Visibility>::get() )
+else if ( pType == cppu::UnoType< ::com::sun::star::frame::status::Visibility>::get() )
{
Visibility aVisibilityStatus;
rEvent.State >>= aVisibilityStatus;
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basegfx/source connectivity/source dbaccess/source editeng/source fpicker/source mysqlc/source qadevOOo/testdocs sc/source svx/source sw/source vcl/source vcl/unx write
basegfx/source/curve/b2dcubicbezier.cxx |
4 ++--
connectivity/source/commontools/dbtools.cxx |
4 ++--
dbaccess/source/core/api/KeySet.cxx |
2 +-
dbaccess/source/core/api/OptimisticSet.cxx |
2 +-
dbaccess/source/core/api/RowSetCache.cxx |
4 ++--
dbaccess/source/ui/tabledesign/TableController.cxx |
2 +-
editeng/source/outliner/outlvw.cxx |
2 +-
fpicker/source/aqua/FilterHelper.mm |
8
mysqlc/source/mysqlc_connection.cxx |
2 +-
qadevOOo/testdocs/qadevlibs/source/com/sun/star/cmp/MyPersistObject.java |
2 +-
sc/source/core/data/attarray.cxx |
2 +-
sc/source/core/tool/chgtrack.cxx |
2 +-
sc/source/filter/excel/xeescher.cxx |
2 +-
sc/source/ui/vba/vbarange.cxx|
2 +-
svx/source/svdraw/svdograf.cxx |
2 +-
sw/source/core/doc/doc.cxx |
4 ++--
sw/source/core/doc/docbm.cxx |
2 +-
sw/source/core/text/porfld.cxx |
2 +-
sw/source/filter/ww8/ww8par.cxx |
2 +-
vcl/source/control/ilstbox.cxx |
2 +-
vcl/source/control/scrbar.cxx|
8
vcl/unx/x11/x11sys.cxx |
2 +-
writerfilter/source/dmapper/DomainMapper.cxx |
2 +-
writerfilter/source/dmapper/SettingsTable.cxx|
2 +-
24 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 794f09f195a449e387ebfbd53eb1b693803c95e7
Author: Noel Grandin
Date: Tue May 6 07:44:11 2014 +0200
simplify ternary conditions "xxx ? true : yyy"
Look for code like:
xxx ? true : yyy;
Which can be simplified to:
xxx || yyy
Change-Id: Ib7ca86580bfd0cf04674328a3c0cf3747de4758d
diff --git a/basegfx/source/curve/b2dcubicbezier.cxx
b/basegfx/source/curve/b2dcubicbezier.cxx
index 6533752..a331e0e 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -133,8 +133,8 @@ namespace basegfx
if(!bBaseEqualZero)
{
-const bool bLeftParallel(bLeftEqualZero ? true :
areParallel(aLeft, aBase));
-const bool bRightParallel(bRightEqualZero ? true :
areParallel(aRight, aBase));
+const bool bLeftParallel(bLeftEqualZero ||
areParallel(aLeft, aBase));
+const bool bRightParallel(bRightEqualZero ||
areParallel(aRight, aBase));
if(bLeftParallel && bRightParallel)
{
diff --git a/connectivity/source/commontools/dbtools.cxx
b/connectivity/source/commontools/dbtools.cxx
index 97342ae..3ce8bf2 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -800,8 +800,8 @@ namespace
break;
}
return NameComponentSupport(
-bIgnoreMetaData ? true : (_rxMetaData.get()->*pCatalogCall)(),
-bIgnoreMetaData ? true : (_rxMetaData.get()->*pSchemaCall)()
+bIgnoreMetaData || (_rxMetaData.get()->*pCatalogCall)(),
+bIgnoreMetaData || (_rxMetaData.get()->*pSchemaCall)()
);
}
}
diff --git a/dbaccess/source/core/api/KeySet.cxx
b/dbaccess/source/core/api/KeySet.cxx
index 59a9755..d32b973 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -146,7 +146,7 @@ OKeySet::~OKeySet()
void OKeySet::initColumns()
{
Reference xMeta = m_xConnection->getMetaData();
-bool bCase = (xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers()) ?
true : false;
+bool bCase = xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers();
m_pKeyColumnNames.reset( new SelectColumnsMetaData(bCase) );
m_pColumnNames.reset( new SelectColumnsMetaData(bCase) );
m_pParameterNames.reset( new SelectColumnsMetaData(bCase) );
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx
b/dbaccess/source/core/api/OptimisticSet.cxx
index 2a60e22..84cbc7a 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -111,7 +111,7 @@ void OptimisticSet::construct(const Reference< XResultSet>&
_xDriverSet,const OU
m_sRowSetFilter = i_sRowSetFilter;
Reference xMeta = m_xConnection->getMet
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/statbar/stbitem.cxx |2 +-
sfx2/source/toolbox/tbxitem.cxx |8
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 3f569908ac72c20826a45ebed59af9b1e5449207
Author: Julien Nabet
Date: Tue May 6 07:39:09 2014 +0200
Remove C11ism
Change-Id: I093ef950f7097021dec3b829d4e11e7b20fc9292
diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx
index 549b46f..df13974 100644
--- a/sfx2/source/statbar/stbitem.cxx
+++ b/sfx2/source/statbar/stbitem.cxx
@@ -286,7 +286,7 @@ throw ( ::com::sun::star::uno::RuntimeException,
std::exception )
rEvent.State >>= sTemp ;
pItem = new SfxStringItem( nSlotID, sTemp );
}
-else if ( pType ==
cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+else if ( pType == cppu::UnoType<
::com::sun::star::frame::status::ItemStatus>::get() )
{
frame::status::ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index bb1be33..2b4efb0 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -565,14 +565,14 @@ throw ( ::com::sun::star::uno::RuntimeException,
std::exception )
rEvent.State >>= sTemp ;
pItem = new SfxStringItem( nSlotId, sTemp );
}
-else if ( pType ==
cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+else if ( pType == cppu::UnoType<
::com::sun::star::frame::status::ItemStatus>::get() )
{
ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
eState = aItemStatus.State;
pItem = new SfxVoidItem( nSlotId );
}
-else if ( pType ==
cppu::UnoType<::com::sun::star::frame::status::Visibility>::get() )
+else if ( pType == cppu::UnoType<
::com::sun::star::frame::status::Visibility>::get() )
{
Visibility aVisibilityStatus;
rEvent.State >>= aVisibilityStatus;
@@ -,14 +,14 @@ throw ( ::com::sun::star::uno::RuntimeException,
std::exception )
rEvent.State >>= sTemp ;
pItem = new SfxStringItem( nSlotId, sTemp );
}
-else if ( pType ==
cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+else if ( pType == cppu::UnoType<
::com::sun::star::frame::status::ItemStatus>::get() )
{
ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
eState = aItemStatus.State;
pItem = new SfxVoidItem( nSlotId );
}
-else if ( pType ==
cppu::UnoType<::com::sun::star::frame::status::Visibility>::get() )
+else if ( pType == cppu::UnoType<
::com::sun::star::frame::status::Visibility>::get() )
{
Visibility aVisibilityStatus;
rEvent.State >>= aVisibilityStatus;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/control/querystatus.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 1567853a8236f5cc7b09df6002c9b9325d931a7b
Author: Julien Nabet
Date: Tue May 6 07:35:26 2014 +0200
Remove C11ism
Change-Id: Id5ae0cf42aa8d6ed464eb1149ebdd172a284a75f
diff --git a/sfx2/source/control/querystatus.cxx
b/sfx2/source/control/querystatus.cxx
index f9fa487..04e91f0 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -135,14 +135,14 @@ throw( RuntimeException, std::exception )
rEvent.State >>= sTemp ;
m_pItem = new SfxStringItem( m_nSlotID, sTemp );
}
-else if ( pType ==
cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
+else if ( pType == cppu::UnoType<
::com::sun::star::frame::status::ItemStatus>::get() )
{
ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
m_eState = aItemStatus.State;
m_pItem = new SfxVoidItem( m_nSlotID );
}
-else if ( pType ==
cppu::UnoType<::com::sun::star::frame::status::Visibility>::get() )
+else if ( pType == cppu::UnoType<
::com::sun::star::frame::status::Visibility>::get() )
{
Visibility aVisibilityStatus;
rEvent.State >>= aVisibilityStatus;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - basic/source cui/source editeng/source framework/source include/editeng include/svl include/tools offapi/com sc/source svl/source svtools/source sw/inc sw/s
basic/source/classes/sbunoobj.cxx |2 +-
basic/source/runtime/runtime.cxx |2 +-
cui/source/inc/numpages.hxx|3 ---
cui/source/tabpages/numpages.cxx |1 -
editeng/source/misc/swafopt.cxx|2 +-
framework/source/helper/vclstatusindicator.cxx |2 +-
include/editeng/svxrtf.hxx |2 +-
include/svl/itempool.hxx |2 +-
include/tools/color.hxx|4 ++--
offapi/com/sun/star/drawing/GraphicObjectShape.idl |2 +-
sc/source/ui/docshell/docsh.cxx|2 +-
sc/source/ui/src/scfuncs.src |4 ++--
sc/source/ui/view/printfun.cxx |4 ++--
svl/source/items/itempool.cxx |2 +-
svl/source/items/poolio.cxx|4 ++--
svl/source/items/style.cxx |2 +-
svl/source/numbers/zforfind.cxx|2 +-
svtools/source/contnr/imivctl1.cxx |2 +-
sw/inc/tblafmt.hxx |2 +-
sw/inc/tox.hxx |2 +-
sw/source/core/doc/docfmt.cxx | 10 +-
sw/source/core/text/porlay.cxx |4 ++--
sw/source/core/uibase/frmdlg/colmgr.cxx|2 +-
23 files changed, 30 insertions(+), 34 deletions(-)
New commits:
commit 65f61d1bf7e59fd643ca3da4a25c8ace8e5507e6
Author: Thomas Arnhold
Date: Tue May 6 07:08:01 2014 +0200
fdo#78321 Bullets and Numbering: SvxNumberingPreview looks ugly
Just remove the inner rectangle. Now it looks nice.
Change-Id: Icd3d3971292f958d1ffdd3dc6a7697005b5f9047
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index b4714a5..b4e46aa 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -464,7 +464,4 @@ public:
#endif
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 0ab58a6..a1265f9 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2302,7 +2302,6 @@ voidSvxNumberingPreview::Paint( const Rectangle&
/*rRect*/ )
aLineColor.Invert();
pVDev->SetLineColor(aLineColor);
pVDev->SetFillColor( aBackColor );
-pVDev->DrawRect(aRect);
if(pActNum)
{
commit 9e436082af14b2202229589325cee0518fd6107d
Author: Thomas Arnhold
Date: Mon May 5 22:41:17 2014 +0200
dflt -> default
Change-Id: I89f1f5771eb7d96da233a8c7386b906b2a3a9c3e
diff --git a/basic/source/classes/sbunoobj.cxx
b/basic/source/classes/sbunoobj.cxx
index b0eca56..296e706 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -162,7 +162,7 @@ void SetSbUnoObjectDfltPropName( SbxObject* pObj )
if ( SbUnoObject::getDefaultPropName( pUnoObj, sDfltPropName ) )
{
-OSL_TRACE("SetSbUnoObjectDfltPropName setting dflt prop for %s",
OUStringToOString( pObj->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
+OSL_TRACE("SetSbUnoObjectDfltPropName setting default prop for
%s", OUStringToOString( pObj->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() );
pUnoObj->SetDfltProperty( sDfltPropName );
}
}
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index af50e09..8bfdb52 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -3314,7 +3314,7 @@ void SbiRuntime::StepSETCLASS_impl( sal_uInt32 nOp1, bool
bHandleDflt )
bool bOk = checkClass_Impl( refVal, aClass, true );
if( bOk )
{
-StepSET_Impl( refVal, refVar, bHandleDflt ); // don't do handle dflt
prop for a "proper" set
+StepSET_Impl( refVal, refVar, bHandleDflt ); // don't do handle
default prop for a "proper" set
}
}
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index deee6fc..74645ed 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -61,7 +61,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
bDummy6 = bDummy7 = bDummy8 =
false;
-nRightMargin = 50; // dflt. 50%
+nRightMargin = 50; // default 50%
nAutoCmpltExpandKey = KEY_RETURN;
aBulletFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index cc0f2b8..33a8339 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -326,7 +326,7 @@ public:
virtual SvParserState CallParser() SAL_OVERRIDE;
inline const Color& GetColor( size_t nId ) const;
-const Font& GetFont( sal_uInt16 nId ); // Changes the dflt Font
+const Font& GetFont( sal_uInt16 nId ); // Changes the default Font
virtual bool IsEndPara( Svx
[Libreoffice-commits] core.git: Changes to 'private/moggi/chart-opengl-window-version2'
New branch 'private/moggi/chart-opengl-window-version2' available with the following commits: commit 361add4f66ccba797d1bcdb3be5d463cfdaf268c Author: Markus Mohrhard Date: Tue May 6 06:16:56 2014 +0200 provide the OpenGL window This approach looks much better. We get size and position correct without much work and can easily plug the window into the sc window hierarchy. We still have a crash on exit as the ScGridWindow goes out of scope and the SystemChildWindow is still alive. We need to fix it and bind the lifecycle of the SystemChildWindow to ScGridWindow. Another open item is the OpenGL context work. Right now it looks like the best way forward is to create a subclass of SystemChildWindow that contains the OpenGLContext. Change-Id: Ie0a74531e1b818cea92912345464c8fa219bbae2 commit 3e9b56d171c15355f12776a5b83e78039eb2352d Author: Markus Mohrhard Date: Tue May 6 03:41:01 2014 +0200 sal_Bool to bool Change-Id: I2febe40b1128eefa8838f3dc0836863ed96c0048 commit fa5f74e98007f3f3b080c012a969320c6646d741 Author: Markus Mohrhard Date: Tue May 6 02:49:56 2014 +0200 fix typo Change-Id: Ic54d87505ac628abfec6942403a066cdb3e02a01 commit bda39b2a7be21c608f799be63bf45e9a1db8 Author: Markus Mohrhard Date: Tue May 6 02:05:29 2014 +0200 remove global variable Change-Id: Ie5f55feb39798dff27e0c6b41d5b88b6e9bf19bc commit e64a821ecac0e623d3c77b84a95cf10c53c1605f Author: Markus Mohrhard Date: Tue May 6 01:39:19 2014 +0200 remove whitespace Change-Id: I4c2d0447526bda4ccbe2fa7edaf8be1886d214f0 commit 749e56bcaa7cc6dcb2c971fa36f12d39fd9648a2 Author: xukai Date: Mon May 5 14:05:08 2014 +0800 add codes to Line::render() Change-Id: I6510f486707b08ea8f611105f40cc4c7e1581a7f commit e03aa806f2aa5ba76faa7dfbf6765c54b5f596ad Author: xukai Date: Mon May 5 13:00:46 2014 +0800 remove the codes of set camera info to render() Change-Id: I9c2aecd5dea617e7cd69c1fc005b6a9ee237f202 commit dcdda195e606f4b0c0fbef74f95d30473de5e14b Author: xukai Date: Mon May 5 12:25:42 2014 +0800 add codes to set camera info Change-Id: Id6bac3a8dd46d7994c9e64c9e0c16e8c7ac036ac commit 63659f160edb84a652de5e2eaccfe2ab7c1a8b0e Author: xukai Date: Mon May 5 11:54:26 2014 +0800 Initial size of OpenGL3DRenderer Change-Id: Ibfed531e48848ea711be429d6e5c08094473f781 commit 1b6d56bd5ac3a4d33b7e73f753c937259e4e60cd Author: xukai Date: Mon May 5 11:06:30 2014 +0800 Initialization of light Change-Id: I91220e8ebffa0090fa7e9146df853f16b6783491 commit fdc5e0a6bfc3c3499be2116297ccac33ba364a9f Author: xukai Date: Mon May 5 10:42:20 2014 +0800 Introduce OpenGL3DRenderer object Change-Id: If0454ace5ef21b9d32299f3edea115a2726aac00 commit 42e58669510e81c5bdf6c999393309b3e6687b2b Author: xukai Date: Mon May 5 10:36:32 2014 +0800 To implement an abstract method:isOpenGLInitialized Change-Id: I651c0e5830008fd08ba886ccf1be99d40868bb72 commit 3d8311a0c2898177015d26c850f9aebdd1beacc3 Author: xukai Date: Mon May 5 10:28:38 2014 +0800 Update Function Set3DSenceInfo Change-Id: Ic117de10be2181a80e65ea48c888789456abfb0a commit dab00b785d34713fb7818c8f7f0d2e98f416227e Author: Markus Mohrhard Date: Mon May 5 17:43:59 2014 +0200 fix whitespace issues Change-Id: I7a3680aa324c4242572b71c91ec5bc4f85eff9e9 commit f3cfa586df1226b9f93a0921c305fd7057ddd8c6 Author: xukai Date: Sun May 4 17:05:05 2014 +0800 add vertex shader and fragment shader for 3D rendering Change-Id: I7b1ca054006500d468da73d2d85eafaad85dda67 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 78266, which changed state. Bug 78266 Summary: CRASH: Trying to access Menu Tools -> Options https://bugs.freedesktop.org/show_bug.cgi?id=78266 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: vcl/source
vcl/source/opengl/OpenGLContext.cxx | 31 +++
1 file changed, 23 insertions(+), 8 deletions(-)
New commits:
commit f585323f89207b4ff93c6b0dbf1d80b0253bac02
Author: Jan Holesovsky
Date: Tue May 6 02:27:08 2014 +0200
OpenGLContext: More error handling.
Change-Id: Ib92adfc83c963ecfcfa7fdbc2ec71f363a181330
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 3e838ea..8faa4d9 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -423,22 +423,34 @@ bool OpenGLContext::ImplInit()
};
// we must check whether can set the MSAA
-int WindowPix;
+int WindowPix = 0;
bool bMultiSampleSupport = InitMultisample(PixelFormatFront, WindowPix);
-if (bMultiSampleSupport)
+if (bMultiSampleSupport && WindowPix != 0)
{
m_aGLWin.bMultiSampleSupported = true;
}
else
{
-WindowPix = ChoosePixelFormat(m_aGLWin.hDC,&PixelFormatFront);
+WindowPix = ChoosePixelFormat(m_aGLWin.hDC, &PixelFormatFront);
}
-SetPixelFormat(m_aGLWin.hDC,WindowPix,&PixelFormatFront);
-m_aGLWin.hRC = wglCreateContext(m_aGLWin.hDC);
-if (!wglMakeCurrent(m_aGLWin.hDC,m_aGLWin.hRC))
+if (WindowPix == 0)
{
-SAL_WARN("vcl.opengl", "Failed wglMakeCurrent: " << GetLastError());
+SAL_WARN("vcl.opengl", "Invalid pixelformat");
+return false;
+}
+
+SetPixelFormat(m_aGLWin.hDC, WindowPix, &PixelFormatFront);
+m_aGLWin.hRC = wglCreateContext(m_aGLWin.hDC);
+if (m_aGLWin.hRC == NULL)
+{
+SAL_WARN("vcl.opengl", "wglCreateContext failed");
+return false;
+}
+
+if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
+{
+SAL_WARN("vcl.opengl", "wglMakeCurrent failed: " << GetLastError());
return false;
}
@@ -757,7 +769,10 @@ SystemWindowData OpenGLContext::generateWinData(Window*
pParent)
void OpenGLContext::makeCurrent()
{
#if defined( WNT )
-wglMakeCurrent(m_aGLWin.hDC,m_aGLWin.hRC);
+if (!wglMakeCurrent(m_aGLWin.hDC, m_aGLWin.hRC))
+{
+SAL_WARN("vcl.opengl", "OpenGLContext::makeCurrent(): wglMakeCurrent
failed: " << GetLastError());
+}
#elif defined( MACOSX ) || defined( IOS ) || defined( ANDROID )
// nothing
#elif defined( UNX )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - avmedia/source sal/osl vcl/source
avmedia/source/viewer/mediawindow_impl.cxx |2 +-
sal/osl/all/log.cxx|1 +
vcl/source/opengl/OpenGLContext.cxx|4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 18d4f6c9ee24dc080bc3b6fed7403f5d0c18f965
Author: Jan Holesovsky
Date: Tue May 6 02:31:42 2014 +0200
Use WB_CLIPCHILDREN consistently.
Change-Id: Ifd53e37d23c29efb2f084a39b48c88ea4bc0d70a
diff --git a/avmedia/source/viewer/mediawindow_impl.cxx
b/avmedia/source/viewer/mediawindow_impl.cxx
index e52e524..58c2d49 100644
--- a/avmedia/source/viewer/mediawindow_impl.cxx
+++ b/avmedia/source/viewer/mediawindow_impl.cxx
@@ -84,7 +84,7 @@ MediaChildWindow::MediaChildWindow( Window* pParent ) :
}
MediaChildWindow::MediaChildWindow( Window* pParent, SystemWindowData* pData )
:
-SystemChildWindow( pParent, 0, pData )
+SystemChildWindow( pParent, WB_CLIPCHILDREN, pData )
{
}
commit d9fb35083dd34a4a3b486e4b1c8969448c522103
Author: Jan Holesovsky
Date: Tue May 6 02:22:57 2014 +0200
OpenGLContext: Use the right window handle on Windows.
Change-Id: I77eaf1dad9ce4c855b5f88bd8568944fd4128227
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 5271214..3e838ea 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -566,8 +566,6 @@ void OpenGLContext::renderToFile()
bool OpenGLContext::initWindow()
{
-const SystemEnvData* sysData(mpWindow->GetSystemData());
-m_aGLWin.hWnd = sysData->hWnd;
if( !m_pChildWindow )
{
SystemWindowData winData = generateWinData(mpWindow);
@@ -583,6 +581,8 @@ bool OpenGLContext::initWindow()
m_pChildWindow->SetControlForeground();
m_pChildWindow->SetControlBackground();
m_pChildWindow->EnablePaint(sal_False);
+
+const SystemEnvData* sysData(m_pChildWindow->GetSystemData());
m_aGLWin.hWnd = sysData->hWnd;
}
commit 68e5207306dad9ce4cdf95283f4b2c5e32f131e2
Author: Jan Holesovsky
Date: Mon May 5 18:32:49 2014 +0200
sal logging: Flush after having written the output.
Makes it possible to see the messages immediately on Windows; otherwise the
SAL_DEBUG() etc. is useless as it shows on screen too late.
Change-Id: I701922aa4fcacf66d6b044e0badca7ef1f9cac94
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 056d2a4..aa3105d 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -240,6 +240,7 @@ void log(
#endif
} else {
std::fputs(s.str().c_str(), stderr);
+std::fflush(stderr);
}
#endif
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
fdo#63315: sign windows binaries during build
Hello See https://bugs.freedesktop.org/show_bug.cgi?id=63315 From the Cloph's comment it seems the issue is fixed but with room for improvement. Should we close it or not ? Kind regards Mat M ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
fdo#63315: sign windows binaries during build
Hello See https://bugs.freedesktop.org/show_bug.cgi?id=63315 From the Cloph's comment it seems the issue is fixed but with room for improvement. Should we close it or not ? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[ANN] LIbreOffice 4.2.4 RC2 available
Dear Community, The Document Foundation is pleased to announce the second release candidate of LibreOffice 4.2.4. The upcoming 4.2.4 will be the fourth in a sequence of frequent bugfix releases for our feature-packed 4.2 line. Feel free to give it a try instead of 4.2.3. Conservative users should continue to use LibreOffice 4.1.6 The release is available for Windows, Linux and Mac OS X from our QA builds download page at http://www.libreoffice.org/download/pre-releases/ Developers and QA might also be interested in the symbol server for windows debug information (see the release notes linked below for details) Should you find bugs, please report them to the FreeDesktop Bugzilla: https://bugs.freedesktop.org A good way to assess the release candidate quality is to run some specific manual tests on it, our TCM wiki page has more details: http://wiki.documentfoundation.org/QA/Testing/Regression_Tests#Full_Regression_Test For other ways to get involved with this exciting project - you can e.g. contribute code: http://www.libreoffice.org/community/developers/ translate LibreOffice to your language: http://wiki.documentfoundation.org/LibreOffice_Localization_Guide or help with funding our operations: http://donate.libreoffice.org/ A list of known issues and fixed bugs with 4.2.4 RC2 is available from our wiki: http://wiki.documentfoundation.org/Releases/4.2.4/RC2 Let us close again with a BIG Thank You! to all of you having contributed to the LibreOffice project - this release would not have been possible without your help. On behalf of the Community, Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 4 commits - sw/source vcl/unx
sw/source/core/access/acctable.cxx | 44 ++---
sw/source/core/access/acctable.hxx |9 ---
sw/source/core/layout/tabfrm.cxx | 22 --
sw/source/core/undo/untbl.cxx | 20 +++-
vcl/unx/gtk/a11y/atklistener.cxx |5 +++-
5 files changed, 50 insertions(+), 50 deletions(-)
New commits:
commit d09d75167d77adcc8538c5cc5d8fe6bac6091ca1
Author: Michael Stahl
Date: Mon May 5 23:33:00 2014 +0200
AtkListener: consistency check is too strict
Apparently it can happen in JunitTest_sw_unoapi that between the
getAccessibleChildCount() and the getAccessibleChild() calls that the
children all disappear; try not to assert in that case.
Change-Id: Iec8e373281950bf684fa76d69f8c4625ecd1255a
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index 3349be8..511ff0a 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -137,7 +137,10 @@ void
AtkListener::updateChildList(accessibility::XAccessibleContext* pContext)
}
catch (lang::IndexOutOfBoundsException const&)
{
- assert(false); // not consistent with getAccessibleChildCount
+ sal_Int32 nChildren2 = pContext->getAccessibleChildCount();
+ assert(nChildren2 <= n); // consistency?
+ m_aChildList.resize(std::min(nChildren2, n));
+ break;
}
OSL_ASSERT(m_aChildList[n].is());
}
commit f66d9badf9e510f5bbc94201edd5a53c26f8526a
Author: Michael Stahl
Date: Mon May 5 21:45:55 2014 +0200
sw: don't dispose SwAccessibles in SwRowFrm::Cut()
This does not appear to work so well: for a row with multiple cells,
when the second cell frame's SwAccessible is disposed it will send an
event, and the AtkListener will then request all children of the row,
and this causes a new SwAccessible to be created for the first cell
frame that was disposed previously.
Unlike most other events, Dispose events cannot be sent delayed.
The SwAccessibles are disposed from ~SwCellFrm already, that should be
sufficient.
Change-Id: I6da72605e5386540f8d82535fca151e97d70869f
diff --git a/sw/source/core/access/acctable.cxx
b/sw/source/core/access/acctable.cxx
index 2bb9fd6..979dd0d 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -1446,7 +1446,8 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const
SwAccessibleChild& rChil
SwAccessibleTableData_Impl *pNewTableData = CreateNewTableData();
// #i77106#
if( !pNewTableData->CompareExtents( GetTableData() ) )
{
-if(pNewTableData->GetRowCount()!= mpTableData->GetRowCount())
+if (pNewTableData->GetRowCount() != mpTableData->GetRowCount()
+&& 1 < GetTableData().GetRowCount())
{
Int32Set_Impl::const_iterator aSttCol(
GetTableData().GetColumnIter( 0 ) );
Int32Set_Impl::const_iterator aSttRow(
GetTableData().GetRowIter( 1 ) );
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 7ac3764..8b26e60 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4178,28 +4178,6 @@ void SwRowFrm::Cut()
pTab->FindMaster()->InvalidatePos();
}
-// #i103961#
-// notification for accessibility
-{
-SwRootFrm *pRootFrm = getRootFrm();
-if( pRootFrm && pRootFrm->IsAnyShellAccessible() )
-{
-SwViewShell* pVSh = pRootFrm->GetCurrShell();
-if ( pVSh && pVSh->Imp() )
-{
-SwFrm* pCellFrm( GetLower() );
-while ( pCellFrm )
-{
-OSL_ENSURE( pCellFrm->IsCellFrm(),
-" - unexpected type of SwRowFrm
lower." );
-pVSh->Imp()->DisposeAccessibleFrm( pCellFrm );
-
-pCellFrm = pCellFrm->GetNext();
-}
-}
-}
-}
-
SwLayoutFrm::Cut();
}
commit a82de8698a4569d043a3f656a4afbe21a952f8d3
Author: Michael Stahl
Date: Mon May 5 21:30:43 2014 +0200
fdo#57197: sw: fix crash on Undo of table row insert on 1-row table
... with accessibility enabled: the SwCellFrms are deleted, but the
entry in the SwAccessibleMap::mpFrmMap is not removed, because Dispose
returns early since the connections to the nodes have been severed already.
This then crashes in some questionable code that iterates over and uses
the frame pointers in mpFrmMap that was added in
76c549eb01dcb7b5bf28a271ce00e386f3d388ba (where previously only the
WeakReferences were used out of that map).
Change-Id: I13885c6ab9a92e34e95925f275e15c20fdc600b7
diff --git a/sw/source/core/undo/untbl.cxx
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|56394 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||56394 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: chart2/source sfx2/source
chart2/source/tools/ObjectIdentifier.cxx |4 ++--
chart2/source/tools/RangeHighlighter.cxx |6 +++---
sfx2/source/control/querystatus.cxx | 10 +-
sfx2/source/control/statcach.cxx |6 +++---
sfx2/source/statbar/stbitem.cxx |8
sfx2/source/toolbox/tbxitem.cxx | 20 ++--
6 files changed, 27 insertions(+), 27 deletions(-)
New commits:
commit ebd4986c3495239f09510f2c0c79b6e30acda83e
Author: Julien Nabet
Date: Mon May 5 23:24:25 2014 +0200
Prefer cppu::UnoType::get() to ::getCppuType((T*)0) part2
Change-Id: Ibca921eff3647507ffb7e9011a84aeefbec58d7a
diff --git a/chart2/source/tools/ObjectIdentifier.cxx
b/chart2/source/tools/ObjectIdentifier.cxx
index c681b86..9edbdf0 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -259,11 +259,11 @@ ObjectIdentifier::ObjectIdentifier( const Any& rAny )
,m_xAdditionalShape( 0 )
{
const uno::Type& rType = rAny.getValueType();
-if ( rType == ::getCppuType( static_cast< const OUString* >( 0 ) ) )
+if ( rType == cppu::UnoType::get() )
{
rAny >>= m_aObjectCID;
}
-else if ( rType == ::getCppuType( static_cast< const Reference<
drawing::XShape >* >( 0 ) ) )
+else if ( rType == cppu::UnoType< drawing::XShape >::get() )
{
rAny >>= m_xAdditionalShape;
}
diff --git a/chart2/source/tools/RangeHighlighter.cxx
b/chart2/source/tools/RangeHighlighter.cxx
index 6a865a1..cc7e431 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -97,7 +97,7 @@ void RangeHighlighter::determineRanges()
uno::Any aSelection( m_xSelectionSupplier->getSelection());
const uno::Type& rType = aSelection.getValueType();
-if ( rType == ::getCppuType( static_cast< const OUString* >( 0 ) )
)
+if ( rType == cppu::UnoType::get() )
{
// @todo??: maybe getSelection() should return a model object
rather than a CID
@@ -164,7 +164,7 @@ void RangeHighlighter::determineRanges()
}
}
}
-else if ( rType == ::getCppuType( static_cast< const Reference<
drawing::XShape >* >( 0 ) ) )
+else if ( rType == cppu::UnoType< drawing::XShape >::get() )
{
// #i12587# support for shapes in chart
Reference< drawing::XShape > xShape;
@@ -336,7 +336,7 @@ void SAL_CALL RangeHighlighter::selectionChanged( const
lang::EventObject& /*aEv
void RangeHighlighter::fireSelectionEvent()
{
::cppu::OInterfaceContainerHelper* pIC = rBHelper.getContainer(
-::getCppuType((const uno::Reference< view::XSelectionChangeListener
>*)0) );
+cppu::UnoType< view::XSelectionChangeListener >::get() );
if( pIC )
{
lang::EventObject aEvent( static_cast< lang::XComponent* >( this ) );
diff --git a/sfx2/source/control/querystatus.cxx
b/sfx2/source/control/querystatus.cxx
index ef03199..f9fa487 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -117,32 +117,32 @@ throw( RuntimeException, std::exception )
rEvent.State >>= bTemp ;
m_pItem = new SfxBoolItem( m_nSlotID, bTemp );
}
-else if ( pType == ::getCppuType((const sal_uInt16*)0) )
+else if ( pType == ::cppu::UnoType< ::cppu::UnoUnsignedShortType
>::get() )
{
sal_uInt16 nTemp = 0;
rEvent.State >>= nTemp ;
m_pItem = new SfxUInt16Item( m_nSlotID, nTemp );
}
-else if ( pType == ::getCppuType((const sal_uInt32*)0) )
+else if ( pType == cppu::UnoType::get() )
{
sal_uInt32 nTemp = 0;
rEvent.State >>= nTemp ;
m_pItem = new SfxUInt32Item( m_nSlotID, nTemp );
}
-else if ( pType == ::getCppuType((const OUString*)0) )
+else if ( pType == cppu::UnoType::get() )
{
OUString sTemp ;
rEvent.State >>= sTemp ;
m_pItem = new SfxStringItem( m_nSlotID, sTemp );
}
-else if ( pType == ::getCppuType((const
::com::sun::star::frame::status::ItemStatus*)0) )
+else if ( pType ==
cppu::UnoType<::com::sun::star::frame::status::ItemStatus>::get() )
{
ItemStatus aItemStatus;
rEvent.State >>= aItemStatus;
m_eState = aItemStatus.State;
m_pItem = new SfxVoidItem( m_nSlotID );
}
-else if ( pType == ::getCppuType((const
::com::sun::star::frame::status::Visibility*)0) )
+else if ( pType ==
cppu::UnoType<::com::sun::star::frame::status::Visibility>::get() )
{
Visibility aVisibilityStatus;
rEvent.State >>= aVisibilityStatus;
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index fcc7e7f
[Bug 65675] LibreOffice 4.2 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=65675 tommy27 changed: What|Removed |Added Depends on||59886 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 60270] LibreOffice 4.1 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=60270 tommy27 changed: What|Removed |Added Depends on|59886 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
sc/source/ui/docshell/docsh3.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 3efb6e5c35bb1129a78726b163f8fbf9bd94734a Author: Eike Rathke Date: Mon May 5 18:18:57 2014 +0100 resolved fdo#78294 default null-date for document import is 1899-12-30 Change-Id: I9dfe76d422ad732a081442b95a995d8d395a098e (cherry picked from commit 571cefca474e6b77d68f9fa31f805dcf692927fd) Reviewed-on: https://gerrit.libreoffice.org/9253 Reviewed-by: Kohei Yoshida Tested-by: Kohei Yoshida diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index fcb2760f..42817ee 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -428,6 +428,12 @@ void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and L // so it must not be taken from the global options. // Calculation settings are handled separately in ScXMLBodyContext::EndElement. aDocOpt.SetStdPrecision( SvNumberFormatter::UNLIMITED_PRECISION ); + +// fdo#78294 The default null-date if +// +// is absent is 1899-12-30 regardless what the configuration is set to. +// Import filters may override this value. +aDocOpt.SetDate( 30, 12, 1899); } aDocument.SetDocOptions( aDocOpt ); ___ 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' - sc/source
sc/source/filter/excel/xecontent.cxx |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8a14eb18ffc34ab6d7afb8ab0abeb878b3ad2b11
Author: Markus Mohrhard
Date: Tue Apr 29 20:37:36 2014 +0200
escape conditional formatting formulas during xlsx export, fdo#75168
Change-Id: I9ebdb2315b51c2b53d8cfa0486b3ec22a8e0d88d
Reviewed-on: https://gerrit.libreoffice.org/9232
Tested-by: Kohei Yoshida
Reviewed-by: Kohei Yoshida
diff --git a/sc/source/filter/excel/xecontent.cxx
b/sc/source/filter/excel/xecontent.cxx
index 4c4db7f..7ebf959 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -942,13 +942,13 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm )
if(!IsTextRule(eOperation) && !IsTopBottomRule(eOperation))
{
rWorksheet->startElement( XML_formula, FSEND );
-rWorksheet->write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(),
+rWorksheet->writeEscaped(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(),
mrFormatEntry.CreateTokenArry(0)));
rWorksheet->endElement( XML_formula );
if (bFmla2)
{
rWorksheet->startElement( XML_formula, FSEND );
-rWorksheet->write(XclXmlUtils::ToOUString( GetRoot().GetDoc(),
mrFormatEntry.GetValidSrcPos(),
+rWorksheet->writeEscaped(XclXmlUtils::ToOUString(
GetRoot().GetDoc(), mrFormatEntry.GetValidSrcPos(),
mrFormatEntry.CreateTokenArry(1)));
rWorksheet->endElement( XML_formula );
}
___
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 xmloff/source
chart2/source/tools/ErrorBar.cxx |2 +-
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 15 +++
2 files changed, 16 insertions(+), 1 deletion(-)
New commits:
commit 206d59068e1293382a6d11b4caef7ebbd323fb86
Author: Markus Mohrhard
Date: Wed Apr 30 01:20:36 2014 +0200
set graphic properties for error bars during import, fdo#78041
Change-Id: I43138745b074dcacdafa090d97eeb9aa2ccecf78
Reviewed-on: https://gerrit.libreoffice.org/9233
Reviewed-by: Kohei Yoshida
Tested-by: Kohei Yoshida
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index cd55836..5a639bf 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -165,7 +165,7 @@ void ErrorBar::setPropertyValue( const OUString& rPropName,
const uno::Any& rAny
else if(rPropName == "ShowNegativeError")
rAny >>= mbShowNegativeError;
else if(rPropName == "ErrorBarRangePositive" || rPropName ==
"ErrorBarRangeNegative")
-throw uno::RuntimeException("read-only property", static_cast<
uno::XWeak*>(this));
+throw beans::UnknownPropertyException("read-only property",
static_cast< uno::XWeak*>(this));
else
LineProperties::setPropertyValue(rPropName, rAny);
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index c72f1af..e55b771 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -1011,6 +1011,19 @@
SchXMLStatisticsObjectContext::~SchXMLStatisticsObjectContext()
namespace {
+void SetErrorBarStyleProperties( const OUString& rStyleName, uno::Reference<
beans::XPropertySet > xBarProp,
+SchXMLImportHelper& rImportHelper )
+{
+const SvXMLStylesContext* pStylesCtxt =
rImportHelper.GetAutoStylesContext();
+const SvXMLStyleContext* pStyle =
pStylesCtxt->FindStyleChildContext(rImportHelper.GetChartFamilyID(),
+rStyleName);
+
+XMLPropStyleContext * pSeriesStyleContext =
+const_cast< XMLPropStyleContext * >( dynamic_cast< const
XMLPropStyleContext * >( pStyle ));
+
+pSeriesStyleContext->FillPropertySet( xBarProp );
+}
+
void SetErrorBarPropertiesFromStyleName( const OUString& aStyleName,
uno::Reference< beans::XPropertySet> xBarProp,
SchXMLImportHelper& rImportHelper,
OUString& aPosRange, OUString& aNegRange)
{
@@ -1177,6 +1190,8 @@ void SchXMLStatisticsObjectContext::StartElement( const
uno::Reference< xml::sax
xBarProp->setPropertyValue("ShowNegativeError",uno::makeAny(sal_True));
// first import defaults from parent style
+SetErrorBarStyleProperties( maSeriesStyleName, xBarProp,
mrImportHelper );
+SetErrorBarStyleProperties( sAutoStyleName, xBarProp,
mrImportHelper );
SetErrorBarPropertiesFromStyleName( maSeriesStyleName,
xBarProp, mrImportHelper, aPosRange, aNegRange );
SetErrorBarPropertiesFromStyleName( sAutoStyleName,
xBarProp, mrImportHelper, aPosRange, aNegRange );
___
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
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 22d18dfa05e159c7f298e5eb49d8c89356cc5efb Author: Markus Mohrhard Date: Wed Apr 30 02:33:02 2014 +0200 be explicit about text rotations, fdo#70670 Change-Id: I5090a49c2383e6a30165a8eca22b527972c0f507 Reviewed-on: https://gerrit.libreoffice.org/9231 Reviewed-by: Kohei Yoshida Tested-by: Kohei Yoshida diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 9ca382f..f15196e 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -502,7 +502,7 @@ const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties() ::std::vector< ::chart::WrappedProperty* > aWrappedProperties; aWrappedProperties.push_back( new WrappedTitleStringProperty( m_spChart2ModelContact->m_xContext ) ); -aWrappedProperties.push_back( new WrappedTextRotationProperty( m_eTitleType==TitleHelper::Y_AXIS_TITLE || m_eTitleType==TitleHelper::X_AXIS_TITLE ) ); +aWrappedProperties.push_back( new WrappedTextRotationProperty( true ) ); aWrappedProperties.push_back( new WrappedStackedTextProperty() ); WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this ); WrappedAutomaticPositionProperties::addWrappedProperties( aWrappedProperties ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/sfx2 sfx2/source
include/sfx2/thumbnailview.hxx|1 -
sfx2/source/control/thumbnailview.cxx | 14 +++---
2 files changed, 3 insertions(+), 12 deletions(-)
New commits:
commit fb0ca7eff0e16fa8dd1a4c8d75fef23830903a3f
Author: Andrzej Hunt
Date: Mon May 5 20:48:58 2014 +0100
fdo#76261 Get rid of unneeded and malfunctioning maItemListRect.
maItemListRect serves as a sort of bounding box for what items /could/
be visible on screen, however it is only used for determining the id
of an item we have just clicked on -- given that we already know that
we are clicking inside the visible area this is an unnecessary check.
In fact this check is erronous as we no longer limit ourselves to "whole"
rows as of 806919adf9c9bafbaba92c2d2ab35d2e2f9863f8 -- i.e. the previous
assumption was that a view large enough for n rows will show precisely
n (whole) rows, whereas we might be showing (n-1) complete rows, and a
fraction of a row at the top and bottom of the screen, i.e. a total of
n+1 rows, where maItemRect only encloses the top n rows, meaning we
were erronously ignoring clicks on the (partly visible) lowest n+1 row.
Change-Id: Ia52ed2e0d217a9f077cef86ee9c1847252844995
diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index b760426..31faaf7 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -309,7 +309,6 @@ protected:
ThumbnailValueItemList mFilteredItemList; ///< Cache to store the filtered
items
ThumbnailValueItemList::iterator mpStartSelRange;
ScrollBar* mpScrBar;
-Rectangle maItemListRect;
long mnHeaderHeight;
long mnItemWidth;
long mnItemHeight;
diff --git a/sfx2/source/control/thumbnailview.cxx
b/sfx2/source/control/thumbnailview.cxx
index 884084d..a392075 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -350,11 +350,6 @@ void ThumbnailView::CalculateItemPositions (bool
bScrollBarUsed)
size_t nFirstItem = (bScrollBarUsed ? nHiddenLines : mnFirstLine) * mnCols;
size_t nLastItem = nFirstItem + (mnVisLines + 1) * mnCols;
-maItemListRect.Left() = x;
-maItemListRect.Top() = y;
-maItemListRect.Right() = x + mnCols*(mnItemWidth+nHItemSpace) -
nHItemSpace - 1;
-maItemListRect.Bottom() = y + mnVisLines*(mnItemHeight+nVItemSpace) -
nVItemSpace - 1;
-
// If want also draw parts of items in the last line,
// then we add one more line if parts of these line are
// visible
@@ -449,13 +444,10 @@ size_t ThumbnailView::ImplGetItem( const Point& rPos )
const
return THUMBNAILVIEW_ITEM_NOTFOUND;
}
-if ( maItemListRect.IsInside( rPos ) )
+for (size_t i = 0; i < mFilteredItemList.size(); ++i)
{
-for (size_t i = 0; i < mFilteredItemList.size(); ++i)
-{
-if (mFilteredItemList[i]->isVisible() &&
mFilteredItemList[i]->getDrawArea().IsInside(rPos))
-return i;
-}
+if (mFilteredItemList[i]->isVisible() &&
mFilteredItemList[i]->getDrawArea().IsInside(rPos))
+return i;
}
return THUMBNAILVIEW_ITEM_NOTFOUND;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - chart2/source
chart2/source/view/inc/3DChartObjects.hxx |2 +- chart2/source/view/inc/GL3DRenderer.hxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit dbe06b114cc9097a5b7349652dc25c0d2c9c1c5e Author: Tor Lillqvist Date: Mon May 5 22:47:30 2014 +0300 WaE: overriding virtual function declaration not marked 'override' Change-Id: I96e84e3ec756216fabe9739e6bd53d2a89d186b5 diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx index b1f8de4..a6bf266 100644 --- a/chart2/source/view/inc/3DChartObjects.hxx +++ b/chart2/source/view/inc/3DChartObjects.hxx @@ -104,7 +104,7 @@ public: TemporaryContext(); void init(); -void render(); +virtual void render() SAL_OVERRIDE; private: OpenGLContext maContext; commit 6ca24c38cbc0c1df755e51e366c715d4fb4f1d93 Author: Tor Lillqvist Date: Mon May 5 22:45:33 2014 +0300 WaE: overriding virtual function declaration not marked 'override' Change-Id: Ifd89b00c525ed4d75fcffe92845c4ca2f73705a8 diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index 5f66203..4782f50 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -160,7 +160,7 @@ public: void LoadShaders(); void init(); -bool isOpenGLInitialized(); +virtual bool isOpenGLInitialized() SAL_OVERRIDE; void Set3DSenceInfo(sal_Int32 color = 255, bool twoSidesLighting = true); void SetLightInfo(bool lightOn, sal_Int32 color, const glm::vec4& direction); void AddShapePolygon3DObject(sal_Int32 color, bool lineOnly, sal_Int32 lineColor, ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/inc sc/source
sc/inc/document.hxx |9 +
sc/source/core/data/document.cxx | 20 +++-
sc/source/ui/app/transobj.cxx|2 +-
3 files changed, 21 insertions(+), 10 deletions(-)
New commits:
commit fe451fb94a33c914c0a7c1265c013d9704af850a
Author: Kohei Yoshida
Date: Mon May 5 15:22:15 2014 -0400
fdo#78054: Initialize drawing layer when the document contains notes.
Don't be fooled even when the document doesn't have a drawing layer
initialized. Sometimes a note creates caption on demand later, but if
the drawing layer isn't there the caption will not get created, which
ultimately causes this crash.
Change-Id: I37f4902fa84de91c9f793dc352127d9345a725e3
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index f86bdda..3d8bcda 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -933,10 +933,11 @@ public:
SC_DLLPUBLIC ScPostIt* GetNote(SCCOL nCol, SCROW nRow, SCTAB nTab);
void SetNote(const ScAddress& rPos, ScPostIt*
pNote);
void SetNote(SCCOL nCol, SCROW nRow, SCTAB nTab,
ScPostIt* pNote);
-SC_DLLPUBLIC bool HasNote(const ScAddress& rPos);
-bool HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab);
-SC_DLLPUBLIC boolHasColNotes(SCCOL nCol, SCTAB nTab);
-SC_DLLPUBLIC boolHasTabNotes(SCTAB nTab);
+SC_DLLPUBLIC bool HasNote(const ScAddress& rPos) const;
+bool HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab) const;
+SC_DLLPUBLIC bool HasColNotes(SCCOL nCol, SCTAB nTab) const;
+SC_DLLPUBLIC bool HasTabNotes(SCTAB nTab) const;
+bool HasNotes() const;
SC_DLLPUBLIC ScPostIt* ReleaseNote(const ScAddress& rPos);
SC_DLLPUBLIC ScPostIt* GetOrCreateNote(const ScAddress& rPos);
SC_DLLPUBLIC ScPostIt* CreateNote(const ScAddress& rPos);
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 4f90b2f..181f294 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6131,21 +6131,21 @@ void ScDocument::SetNote(SCCOL nCol, SCROW nRow, SCTAB
nTab, ScPostIt* pNote)
return maTabs[nTab]->aCol[nCol].SetCellNote(nRow, pNote);
}
-bool ScDocument::HasNote(const ScAddress& rPos)
+bool ScDocument::HasNote(const ScAddress& rPos) const
{
return HasNote(rPos.Col(), rPos.Row(), rPos.Tab());
}
-bool ScDocument::HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab)
+bool ScDocument::HasNote(SCCOL nCol, SCROW nRow, SCTAB nTab) const
{
-ScPostIt* pNote = maTabs[nTab]->aCol[nCol].GetCellNote(nRow);
+const ScPostIt* pNote = maTabs[nTab]->aCol[nCol].GetCellNote(nRow);
return pNote != NULL;
}
-bool ScDocument::HasColNotes(SCCOL nCol, SCTAB nTab)
+bool ScDocument::HasColNotes(SCCOL nCol, SCTAB nTab) const
{
return maTabs[nTab]->aCol[nCol].HasCellNotes();
}
-bool ScDocument::HasTabNotes(SCTAB nTab)
+bool ScDocument::HasTabNotes(SCTAB nTab) const
{
bool hasNotes = false;
for (SCCOL nCol=0; nColGetDrawLayer() )
+if (pDoc->GetDrawLayer() || pDoc->HasNotes())
pDocSh->MakeDrawLayer();
// cell range is copied to the original position, but on the first
sheet
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - include/sfx2 sfx2/source
include/sfx2/recentdocsview.hxx|2 --
include/sfx2/recentdocsviewitem.hxx|2 +-
include/sfx2/thumbnailviewitem.hxx |2 +-
sfx2/source/control/recentdocsview.cxx | 16
sfx2/source/control/recentdocsviewitem.cxx |2 +-
sfx2/source/doc/guisaveas.cxx |6 --
6 files changed, 11 insertions(+), 19 deletions(-)
New commits:
commit 718fbf4f808def97ad55b1afaeb5af68b9144b96
Author: Maxim Monastirsky
Date: Mon May 5 22:17:59 2014 +0300
Fix indentation
Change-Id: I7ac9792da93a1b5231ddac5398823667b28adf92
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 908ed2a..85a9947 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1715,11 +1715,13 @@ bool SfxStoringHelper::GUIStoreModel( uno::Reference<
frame::XModel > xModel,
}
// Launch PDF viewer
-if ( nStoreMode & PDFEXPORT_REQUESTED ) {
+if ( nStoreMode & PDFEXPORT_REQUESTED )
+{
FilterConfigItem aItem( "Office.Common/Filter/PDF/Export/" );
bool aViewPDF = aItem.ReadBool( "ViewPDFAfterExport", false );
-if ( aViewPDF ) {
+if ( aViewPDF )
+{
uno::Reference
xSystemShellExecute(SystemShellExecute::create(
::comphelper::getProcessComponentContext() ) );
xSystemShellExecute->execute( aURL.GetMainURL(
INetURLObject::NO_DECODE ), "", SystemShellExecuteFlags::URIS_ONLY );
}
commit 1a2a961c1e7cdef648c28e211433e8de6e8a831b
Author: Maxim Monastirsky
Date: Mon May 5 22:00:09 2014 +0300
startcenter: react on mouse down instead
There is a good reason for that: File lists of
some file pickers handle double click event on
mouse down. So if a start center thumbnail is
exactly behind the file on which the user double-
clicked, it will receive the mouse up event, and
will also open.
Change-Id: I9fc9ceff0874d0486d5b568c9b35143c8d8aabf8
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index c1ba062..0ebf30e 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -63,8 +63,6 @@ public:
protected:
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE;
-
virtual void OnItemDblClicked(ThumbnailViewItem *pItem) SAL_OVERRIDE;
virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE;
diff --git a/include/sfx2/recentdocsviewitem.hxx
b/include/sfx2/recentdocsviewitem.hxx
index b1a51fe..71b6474 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -33,7 +33,7 @@ public:
virtual void Paint(drawinglayer::processor2d::BaseProcessor2D *pProcessor,
const ThumbnailItemAttributes *pAttrs) SAL_OVERRIDE;
-virtual void MouseButtonUp(const MouseEvent& rMEvt) SAL_OVERRIDE;
+virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE;
/// Called when the user clicks a document - it will open it.
void OpenDocument();
diff --git a/include/sfx2/thumbnailviewitem.hxx
b/include/sfx2/thumbnailviewitem.hxx
index ee4fd7f..cf3e860 100644
--- a/include/sfx2/thumbnailviewitem.hxx
+++ b/include/sfx2/thumbnailviewitem.hxx
@@ -129,7 +129,7 @@ public:
static drawinglayer::primitive2d::PolygonHairlinePrimitive2D*
createBorderLine (const basegfx::B2DPolygon &rPolygon);
-virtual void MouseButtonUp(const MouseEvent&) {}
+virtual void MouseButtonDown(const MouseEvent&) {}
protected:
diff --git a/sfx2/source/control/recentdocsview.cxx
b/sfx2/source/control/recentdocsview.cxx
index 0564e8b..b4be9c8 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -213,27 +213,19 @@ void RecentDocsView::MouseButtonDown( const MouseEvent&
rMEvt )
{
if (rMEvt.IsLeft())
{
-// ignore to avoid stuff done in ThumbnailView; we don't do selections
etc.
-return;
-}
-
-ThumbnailView::MouseButtonDown(rMEvt);
-}
+if (rMEvt.GetClicks() > 1)
+return;
-void RecentDocsView::MouseButtonUp(const MouseEvent& rMEvt)
-{
-if (rMEvt.IsLeft())
-{
size_t nPos = ImplGetItem(rMEvt.GetPosPixel());
ThumbnailViewItem* pItem = ImplGetItem(nPos);
if (pItem)
{
-pItem->MouseButtonUp(rMEvt);
+pItem->MouseButtonDown(rMEvt);
return;
}
}
-ThumbnailView::MouseButtonUp(rMEvt);
+ThumbnailView::MouseButtonDown(rMEvt);
}
void RecentDocsView::OnItemDblClicked(ThumbnailViewItem *)
diff --git a/sfx2/source/control/recentdocsviewitem.cxx
b/sfx2/source/control/recentdocsviewitem.cxx
index aa2a7e0..0dfef15 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -182,7 +182,7 @@ void
RecentDocsViewItem::Paint(drawinglayer::pro
Re: Need help handling "quoteright" key shortcut for Mac OS X.
> Anyone interested in getting this covered for Mac? Hopefully done now at least for the US English keyboard. Handling this stuff on a keycode level seems to be a disaster area, though. We have mapping tables in vcl/osx/salframeview.mm that as ar as I understand are correct only for the US English keyboard layout. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sw/source
sw/source/core/crsr/crsrsh.cxx |2 -
sw/source/core/crsr/viscrs.cxx |3 +
sw/source/filter/ww8/rtfexportfilter.cxx | 51 +++
sw/source/filter/ww8/rtfexportfilter.hxx | 32 +++
4 files changed, 41 insertions(+), 47 deletions(-)
New commits:
commit 25195658ab405cfc288950e15529e97ceb72575d
Author: Miklos Vajna
Date: Mon May 5 20:49:39 2014 +0200
sw: fix indentation in rtfexportfilter
Change-Id: I3055df538fc4dfa625aa942ad0d0e6b6299c53b3
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx
b/sw/source/filter/ww8/rtfexportfilter.cxx
index 01aaefc..eb324c2 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -29,7 +29,7 @@
using namespace ::com::sun::star;
-RtfExportFilter::RtfExportFilter( const uno::Reference< uno::XComponentContext
>& xCtx)
+RtfExportFilter::RtfExportFilter(const uno::Reference< uno::XComponentContext
>& xCtx)
: m_xCtx(xCtx)
{
}
@@ -38,26 +38,26 @@ RtfExportFilter::~RtfExportFilter()
{
}
-sal_Bool RtfExportFilter::filter( const uno::Sequence< beans::PropertyValue >&
aDescriptor )
-throw (uno::RuntimeException, std::exception)
+sal_Bool RtfExportFilter::filter(const uno::Sequence< beans::PropertyValue >&
aDescriptor) throw(uno::RuntimeException, std::exception)
{
SAL_INFO("sw.rtf", OSL_THIS_FUNC);
utl::MediaDescriptor aMediaDesc = aDescriptor;
-::uno::Reference< io::XStream > xStream =
- aMediaDesc.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_STREAMFOROUTPUT(), uno::Reference< io::XStream >() );
-SvStream* pStream = utl::UcbStreamHelper::CreateStream( xStream, true );
+uno::Reference xStream =
aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STREAMFOROUTPUT(),
uno::Reference< io::XStream >());
+SvStream* pStream = utl::UcbStreamHelper::CreateStream(xStream, true);
m_aWriter.SetStream(pStream);
// get SwDoc*
-uno::Reference< uno::XInterface > xIfc( m_xSrcDoc, uno::UNO_QUERY );
-SwXTextDocument *pTxtDoc = dynamic_cast< SwXTextDocument * >( xIfc.get() );
-if ( !pTxtDoc ) {
+uno::Reference< uno::XInterface > xIfc(m_xSrcDoc, uno::UNO_QUERY);
+SwXTextDocument* pTxtDoc = dynamic_cast< SwXTextDocument* >(xIfc.get());
+if (!pTxtDoc)
+{
return sal_False;
}
-SwDoc *pDoc = pTxtDoc->GetDocShell()->GetDoc();
-if ( !pDoc ) {
+SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+if (!pDoc)
+{
return sal_False;
}
@@ -69,23 +69,23 @@ sal_Bool RtfExportFilter::filter( const uno::Sequence<
beans::PropertyValue >& a
// get SwPaM*
// we get SwPaM for the entire document; copy&paste is handled internally,
not via UNO
-SwPaM aPam( pDoc->GetNodes().GetEndOfContent() );
+SwPaM aPam(pDoc->GetNodes().GetEndOfContent());
aPam.SetMark();
-aPam.Move( fnMoveBackward, fnGoDoc );
+aPam.Move(fnMoveBackward, fnGoDoc);
-SwPaM *pCurPam = new SwPaM( *aPam.End(), *aPam.Start() );
+SwPaM* pCurPam = new SwPaM(*aPam.End(), *aPam.Start());
// export the document
// (in a separate block so that it's destructed before the commit)
{
-RtfExport aExport( this, pDoc, pCurPam, &aPam, NULL );
-aExport.ExportDocument( true );
+RtfExport aExport(this, pDoc, pCurPam, &aPam, NULL);
+aExport.ExportDocument(true);
}
// delete the pCurPam
-if ( pCurPam )
+if (pCurPam)
{
-while ( pCurPam->GetNext() != pCurPam )
+while (pCurPam->GetNext() != pCurPam)
delete pCurPam->GetNext();
delete pCurPam;
}
@@ -94,12 +94,11 @@ sal_Bool RtfExportFilter::filter( const uno::Sequence<
beans::PropertyValue >& a
return sal_True;
}
-void RtfExportFilter::cancel( ) throw (uno::RuntimeException, std::exception)
+void RtfExportFilter::cancel() throw(uno::RuntimeException, std::exception)
{
}
-void RtfExportFilter::setSourceDocument( const uno::Reference<
lang::XComponent >& xDoc )
-throw (lang::IllegalArgumentException, uno::RuntimeException,
std::exception)
+void RtfExportFilter::setSourceDocument(const uno::Reference< lang::XComponent
>& xDoc) throw(lang::IllegalArgumentException, uno::RuntimeException,
std::exception)
{
m_xSrcDoc = xDoc;
}
@@ -108,19 +107,19 @@ void RtfExportFilter::setSourceDocument( const
uno::Reference< lang::XComponent
OUString RtfExport_getImplementationName()
{
-return OUString( IMPL_NAME_RTFEXPORT );
+return OUString(IMPL_NAME_RTFEXPORT);
}
uno::Sequence< OUString > SAL_CALL RtfExport_getSupportedServiceNames() throw()
{
-const OUString aServiceName( "com.sun.star.document.ExportFilter" );
-const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
+const OUString aServiceName("com.sun.star.document.ExportFilter");
+const uno::Sequence< OUString > aSeq(&aServiceName, 1);
return aSeq;
}
-uno::Reference<
[Libreoffice-commits] core.git: 4 commits - vcl/osx
vcl/osx/salframe.cxx| 10 -
vcl/osx/salframeview.mm | 268
2 files changed, 139 insertions(+), 139 deletions(-)
New commits:
commit f4d8fea4653d5918f28df90feca934bdd91b4939
Author: Tor Lillqvist
Date: Mon May 5 21:50:17 2014 +0300
Correct keycode mappings for KEY_QUOTE{LEFT,RIGHT}
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/Headers/Events.h
says that 0x27 is kVK_ANSI_Quote, which we call KEY_QUOTERIGHT,
i.e. the plain ASCII apostrophe, while 0x32 is not the ASCII tilde but
kVK_ANSI_Grave, which we call KEY_QUOTELEFT.
Makes the Command-' binding (see Kohei's
56cce6fd8151a916e1be540ac18724b46d1b15fc) work at least for the US
English keyboard. But not for the Finnish keyboard, for instance,
where the key labeled with an apostrophe (or "ASCII-style" single
quote) generates a different keycode than the single quote key on the
US English keyboard. (Which, I guess, isn't surprising as it after all
is a different physical key.)
In other words, situation normal, using keycodes is a horror as
always...
Change-Id: Ibf8f994370fec75849391e1dba30c7b7d54d237f
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index c766179..6825c9b 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -127,9 +127,9 @@ static sal_uInt16 ImplMapKeyCode(sal_uInt16 nKeyCode)
KEY_C,KEY_V,0,KEY_B,
KEY_Q,KEY_W,KEY_E,KEY_R,
KEY_Y,KEY_T,KEY_1,KEY_2,
KEY_3,KEY_4,KEY_6,KEY_5,
KEY_EQUAL,KEY_9,KEY_7, KEY_SUBTRACT,
KEY_8,KEY_0, KEY_BRACKETRIGHT,KEY_0,
-KEY_U, KEY_BRACKETLEFT,KEY_I,KEY_P,
KEY_RETURN,KEY_L,KEY_J,KEY_QUOTELEFT,
+KEY_U, KEY_BRACKETLEFT,KEY_I,KEY_P,
KEY_RETURN,KEY_L,KEY_J, KEY_QUOTERIGHT,
KEY_K,KEY_SEMICOLON,0,KEY_COMMA,
KEY_DIVIDE,KEY_N,KEY_M,KEY_POINT,
- KEY_TAB,KEY_SPACE,KEY_TILDE, KEY_DELETE,
0, KEY_ESCAPE,0,0,
+ KEY_TAB,KEY_SPACE,KEY_QUOTELEFT, KEY_DELETE,
0, KEY_ESCAPE,0,0,
0, KEY_CAPSLOCK,0,0,
0,0,0,0,
KEY_F17, KEY_DECIMAL,0, KEY_MULTIPLY,
0, KEY_ADD,0,0,
0,0,0, KEY_DIVIDE,
KEY_RETURN,0, KEY_SUBTRACT, KEY_F18,
commit 8b4c33facb242a9d208d79901312ee17deb210df
Author: Tor Lillqvist
Date: Mon May 5 21:48:37 2014 +0300
Untabify and remove trailing spaces
Change-Id: I2acd44d54966dd227f5dc23ca4acde3c50ca8347
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 36adf06..c766179 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -60,57 +60,57 @@ static sal_uInt16 ImplMapCharCode( sal_Unicode aCode )
{
static sal_uInt16 aKeyCodeMap[ 128 ] =
{
-0,0,0,0,
0,0,0,0,
-KEY_BACKSPACE, KEY_TAB, KEY_RETURN,0,
0, KEY_RETURN,0,0,
-0,0,0,0,
0,0,0,0,
-0, KEY_TAB,0, KEY_ESCAPE,
0,0,0,0,
-KEY_SPACE,0,0,0,
0,0,0,0,
-0,0, KEY_MULTIPLY, KEY_ADD,
KEY_COMMA, KEY_SUBTRACT,KEY_POINT, KEY_DIVIDE,
-KEY_0,KEY_1,KEY_2,KEY_3,
KEY_4,KEY_5,KEY_6,KEY_7,
-KEY_8,KEY_9,0,0,
KEY_LESS,KEY_EQUAL, KEY_GREATER,0,
-0,KEY_A,KEY_B,KEY_C,
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Jorendc changed: What|Removed |Added Depends on||78267 -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 changed: What|Removed |Added Depends on|78267 | -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 tommy27 changed: What|Removed |Added Depends on||78267 --- Comment #8 from tommy27 --- I add Bug 78267 - Slideshow: does not go to next slide or animation by mouse click regression from 4.2.x makes Impress almost unusable. -- 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: 3 commits - cui/source cui/uiconfig extensions/source include/svx sc/source sd/source svx/inc svx/source sw/source
cui/source/customize/cfg.src |1 cui/uiconfig/ui/numberingoptionspage.ui |2 cui/uiconfig/ui/numberingpositionpage.ui |2 extensions/source/bibliography/toolbar.src |6 - include/svx/dialogs.hrc |3 sc/source/ui/navipi/navipi.src |3 sc/source/ui/sidebar/CellAppearancePropertyPanel.src |1 sd/source/ui/dlg/LayerDialog.src |2 sd/source/ui/dlg/navigatr.src|5 - svx/inc/helpid.hrc | 14 --- svx/source/sidebar/area/AreaPropertyPanel.src|2 svx/source/stbctrls/stbctrls.src |4 svx/source/tbxctrls/grafctrl.cxx |1 svx/source/tbxctrls/grafctrl.hrc | 22 svx/source/tbxctrls/grafctrl.src | 87 --- sw/source/core/uibase/dbui/mailmergechildwindow.src |1 sw/source/core/uibase/utlui/navipi.src | 23 - 17 files changed, 2 insertions(+), 177 deletions(-) New commits: commit 2fd90ea3e2e59d8a3474dd8ec085c99b85248d27 Author: Thomas Arnhold Date: Mon May 5 18:50:35 2014 +0200 add border to level list box for bullets and numbering this is like it was pre ui conversion Change-Id: Ie0fe230893dc448531a44c6d79c00b4a29120cba diff --git a/cui/uiconfig/ui/numberingoptionspage.ui b/cui/uiconfig/ui/numberingoptionspage.ui index 11338c0..720c9da 100644 --- a/cui/uiconfig/ui/numberingoptionspage.ui +++ b/cui/uiconfig/ui/numberingoptionspage.ui @@ -64,7 +64,7 @@ 6 12 - + True True False diff --git a/cui/uiconfig/ui/numberingpositionpage.ui b/cui/uiconfig/ui/numberingpositionpage.ui index e7511bb..9d9e1d9 100644 --- a/cui/uiconfig/ui/numberingpositionpage.ui +++ b/cui/uiconfig/ui/numberingpositionpage.ui @@ -66,7 +66,7 @@ 6 12 - + True True False commit efa35b2b1120c7cf44791667776ea2b11759e291 Author: Thomas Arnhold Date: Mon May 5 10:44:40 2014 +0200 unused floating window RID_SVXTBX_GRFFILTER Change-Id: I3b6d7091922ed345d24c15c5a52d37521792d551 diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc index 9cf295b..fb417e6 100644 --- a/include/svx/dialogs.hrc +++ b/include/svx/dialogs.hrc @@ -319,9 +319,6 @@ // String-Arrays #define RID_SVXSTR_TEXTENCODING_TABLE (RID_SVX_START + 312) -// Graphic filter -#define RID_SVXTBX_GRFFILTER(RID_SVX_START + 331) - #define RID_SVXERRCODE (RID_SVX_START + 350) // gallery diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 53a78e8..bc6d484 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -82,21 +82,7 @@ #define HID_GALLERY_PROPERTIES "SVX_HID_GALLERY_PROPERTIES" #define HID_GALLERY_RENAME "SVX_HID_GALLERY_RENAME" #define HID_GALLERY_THEMELIST "SVX_HID_GALLERY_THEMELIST" -// free #define HID_GALLERY_WINDOW "SVX_HID_GALLERY_WINDOW" -#define HID_GRFFILTER "SVX_HID_GRFFILTER" -#define HID_GRFFILTER_EMBOSS "SVX_HID_GRFFILTER_EMBOSS" -#define HID_GRFFILTER_INVERT "SVX_HID_GRFFILTER_INVERT" -#define HID_GRFFILTER_MOSAIC "SVX_HID_GRFFILTER_MOSAIC" -#define HID_GRFFILTER_POPART "SVX_HID_GRFFILTER_POPART" -#define HID_GRFFILTER_POSTER "SVX_HID_GRFFILTER_POSTER" -#define HID_GRFFILTER_REMOVENOISE "SVX_HID_GRFFILTER_REMOVENOISE" -#define HID_GRFFILTER_SEPIA "SVX_HID_GRFFILTER_SEPIA" -#define HID_GRFFILTER_SHARPEN "SVX_HID_GRFFILTER_SHARPEN" -#define HID_GRFFILTER_SMOOTH "SVX_HID_GRFFILTER_SMOOTH" -#define HID_GRFFILTER_SOBEL "SVX_HID_GRFFILTER_SOBEL" -#define HID_GRFFILTER_SOLARIZE "SVX_HID_GRFFILTER_SOLARIZE" - #define HID_IMAPDLG_ACTIVE "SVX_HID_IMAPDLG_ACTIVE" #define HID_IMAPDLG_APPLY "SVX_HID_IMAPDLG_APPLY" #define HID_IMAPDLG_CIRCLE "SVX_HID_IMAPDLG_CIRCLE" diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 325b26e..3a4ab6f 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -36,7 +36,6 @@ #include #include -#include "grafctrl.hrc" #include
[Libreoffice-commits] core.git: sc/source
sc/source/ui/docshell/docsh3.cxx |6 ++ 1 file changed, 6 insertions(+) New commits: commit 571cefca474e6b77d68f9fa31f805dcf692927fd Author: Eike Rathke Date: Mon May 5 18:18:57 2014 +0100 resolved fdo#78294 default null-date for document import is 1899-12-30 Change-Id: I9dfe76d422ad732a081442b95a995d8d395a098e diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 645333f..33bb671 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -418,6 +418,12 @@ void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and L // so it must not be taken from the global options. // Calculation settings are handled separately in ScXMLBodyContext::EndElement. aDocOpt.SetStdPrecision( SvNumberFormatter::UNLIMITED_PRECISION ); + +// fdo#78294 The default null-date if +// +// is absent is 1899-12-30 regardless what the configuration is set to. +// Import filters may override this value. +aDocOpt.SetDate( 30, 12, 1899); } aDocument.SetDocOptions( aDocOpt ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/unoobj/appluno.cxx |7 ++---
sc/source/ui/unoobj/cellsuno.cxx | 50 ++-
sc/source/ui/unoobj/datauno.cxx |6 ++--
sc/source/ui/view/formatsh.cxx | 28 -
4 files changed, 36 insertions(+), 55 deletions(-)
New commits:
commit 6726fb5ce2daa363b7e885ae45e59feeb733f051
Author: Takeshi Abe
Date: Tue May 6 02:23:48 2014 +0900
Avoid possible memory leaks in case of exceptions
Change-Id: I8914e0dc253c636a1393672f7a20bcb5d39d4276
diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx
index 2878fed..5ba0f78 100644
--- a/sc/source/ui/unoobj/appluno.cxx
+++ b/sc/source/ui/unoobj/appluno.cxx
@@ -39,6 +39,7 @@
#include "funcdesc.hxx"
#include
#include "ScPanelFactory.hxx"
+#include
using namespace com::sun::star;
@@ -634,18 +635,16 @@ void SAL_CALL ScRecentFunctionsObj::setRecentFunctionIds(
sal_uInt16 nCount = (sal_uInt16) std::min( aRecentFunctionIds.getLength(),
(sal_Int32) LRU_MAX );
const sal_Int32* pAry = aRecentFunctionIds.getConstArray();
-sal_uInt16* pFuncs = nCount ? new sal_uInt16[nCount] : NULL;
+boost::scoped_array pFuncs(nCount ? new sal_uInt16[nCount] :
NULL);
for (sal_uInt16 i=0; iGetAppOptions());
-aNewOpts.SetLRUFuncList(pFuncs, nCount);
+aNewOpts.SetLRUFuncList(pFuncs.get(), nCount);
pScMod->SetAppOptions(aNewOpts);
pScMod->RecentFunctionsChanged(); // update function list child
window
-
-delete[] pFuncs;
}
sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions()
throw(uno::RuntimeException, std::exception)
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 9a13025..e7d3abd 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -127,6 +127,7 @@
#include "dputil.hxx"
#include
+#include
#include
using namespace com::sun::star;
@@ -1536,9 +1537,9 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const
SfxHint& rHint )
const ScUpdateRefHint& rRef = (const ScUpdateRefHint&)rHint;
ScDocument* pDoc = pDocShell->GetDocument();
-ScRangeList* pUndoRanges = NULL;
+boost::scoped_ptr pUndoRanges;
if ( pDoc->HasUnoRefUndo() )
-pUndoRanges = new ScRangeList( aRanges );
+pUndoRanges.reset(new ScRangeList( aRanges ));
if ( aRanges.UpdateReference( rRef.GetMode(), pDoc, rRef.GetRange(),
rRef.GetDx(), rRef.GetDy(), rRef.GetDz() )
)
@@ -1570,8 +1571,6 @@ void ScCellRangesBase::Notify( SfxBroadcaster&, const
SfxHint& rHint )
if ( pUndoRanges )
pDoc->AddUnoRefChange( nObjectId, *pUndoRanges );
}
-
-delete pUndoRanges;
}
else if ( rHint.ISA( SfxSimpleHint ) )
{
@@ -2403,10 +2402,10 @@ void ScCellRangesBase::SetOnePropertyValue( const
SfxItemPropertySimpleEntry* pE
formula::FormulaGrammar::GRAM_UNSPECIFIED :
formula::FormulaGrammar::mapAPItoGrammar( bEnglish, bXML));
-ScValidationData* pNewData =
-pValidObj->CreateValidationData( pDoc,
eGrammar );
+boost::scoped_ptr pNewData(
+pValidObj->CreateValidationData( pDoc,
eGrammar ));
sal_uLong nIndex = pDoc->AddValidationEntry(
*pNewData );
-delete pNewData;
+pNewData.reset();
ScPatternAttr aPattern( pDoc->GetPool() );
aPattern.GetItemSet().Put( SfxUInt32Item(
ATTR_VALIDDATA, nIndex ) );
@@ -2643,7 +2642,7 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const
uno::Sequence< OUString
const OUString* pNames = aPropertyNames.getConstArray();
const uno::Any* pValues = aValues.getConstArray();
-const SfxItemPropertySimpleEntry** pEntryArray = new const
SfxItemPropertySimpleEntry*[nCount];
+boost::scoped_array pEntryArray(new
const SfxItemPropertySimpleEntry*[nCount]);
sal_Int32 i;
for(i = 0; i < nCount; i++)
@@ -2670,8 +2669,8 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const
uno::Sequence< OUString
}
ScDocument* pDoc = pDocShell->GetDocument();
-ScPatternAttr* pOldPattern = NULL;
-ScPatternAttr* pNewPattern = NULL;
+boost::scoped_ptr pOldPattern;
+boost::scoped_ptr pNewPattern;
for(i = 0; i < nCount; i++)
{
@@ -2684,9 +2683,9 @@ void SAL_CALL ScCellRangesBase::setPropertyValues( const
uno::Sequence< OUString
{
if ( !pOldPattern )
{
-pOldPattern = new ScPatternAttr(
*GetCurrentAttrsDeep() );
+
[Libreoffice-commits] core.git: 2 commits - offapi/com vcl/osx
offapi/com/sun/star/awt/Key.idl |9 -
vcl/osx/salframe.cxx|7 +++
2 files changed, 15 insertions(+), 1 deletion(-)
New commits:
commit d177d160260fd901d03952832e563f5da8c30538
Author: Tor Lillqvist
Date: Mon May 5 19:38:07 2014 +0300
Document that the weirder constants are not actually keyboard keys
Change-Id: I8e163e63bfbbbaa5f7f4de2151fea41d735417d0
diff --git a/offapi/com/sun/star/awt/Key.idl b/offapi/com/sun/star/awt/Key.idl
index 5c84843..09b519a 100644
--- a/offapi/com/sun/star/awt/Key.idl
+++ b/offapi/com/sun/star/awt/Key.idl
@@ -24,7 +24,8 @@
module com { module sun { module star { module awt {
-/** These values are used to specifies distinct physical keys.
+/** These values are used to specify distinct physical keys, plus
+some special values used by the OS X implementation.
*/
published constants Key
{
@@ -365,6 +366,12 @@ published constants Key
const short QUOTERIGHT = 1318;
+/** The following values don't correspond to physical keys on any
+keyboard but are used in the OS X implementation of VCL. They
+correspond to some of the action messages of the NSResponder
+abstract class.
+*/
+
const short DELETE_TO_END_OF_PARAGRAPH = 1539;
commit 72ff5d4196bcf0ab498eef40114b449045006ca2
Author: Tor Lillqvist
Date: Mon May 5 19:16:54 2014 +0300
Add more unmapped VCL keycodes to the comment
Change-Id: If417d8091896c9f6c9650cf7d6036ffacbcc0884
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 23748fe..3bb8128 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1036,6 +1036,13 @@ OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
aKeyMap[ KEY_DECIMAL ] = OUString( sal_Unicode( ) );
aKeyMap[ KEY_TILDE ]= OUString( sal_Unicode( ) );
aKeyMap[ KEY_QUOTELEFT ]= OUString( sal_Unicode( ) );
+aKeyMap[ KEY_BRACKETLEFT ]= OUString( sal_Unicode( ) );
+aKeyMap[ KEY_BRACKETRIGHT ]= OUString( sal_Unicode( ) );
+aKeyMap[ KEY_SEMICOLON ]= OUString( sal_Unicode( ) );
+aKeyMap[ KEY_QUOTERIGHT ]= OUString( sal_Unicode( ) );
+aKeyMap[ KEY_CAPSLOCK ]= OUString( sal_Unicode( ) );
+aKeyMap[ KEY_NUMLOCK ]= OUString( sal_Unicode( ) );
+aKeyMap[ KEY_SCROLLLOCK ]= OUString( sal_Unicode( ) );
*/
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 10 commits - chart2/opengl chart2/Package_opengl.mk chart2/source
chart2/Package_opengl.mk |2
chart2/opengl/shape3DFragmentShader.glsl | 111 +
chart2/opengl/shape3DVertexShader.glsl | 30 +
chart2/source/view/inc/3DChartObjects.hxx | 12 ++
chart2/source/view/inc/GL3DRenderer.hxx| 11 +-
chart2/source/view/main/3DChartObjects.cxx | 34 ++
chart2/source/view/main/GL3DRenderer.cxx | 148 +++--
7 files changed, 254 insertions(+), 94 deletions(-)
New commits:
commit e0dc3c8a0a69bb44a583b42d6fb823efbc311dc5
Author: xukai
Date: Mon May 5 14:05:08 2014 +0800
add codes to Line::render()
Change-Id: I6510f486707b08ea8f611105f40cc4c7e1581a7f
diff --git a/chart2/source/view/inc/3DChartObjects.hxx
b/chart2/source/view/inc/3DChartObjects.hxx
index 54b6a24..b1f8de4 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -54,6 +54,8 @@ class Line : public Renderable3DObject
public:
Line( sal_uInt32 nId );
+virtual void render() SAL_OVERRIDE;
+
private:
glm::vec3 maPosBegin;
glm::vec3 maPosEnd;
@@ -87,7 +89,7 @@ class Camera : public Renderable3DObject
{
public:
Camera();
-virtual void render();
+virtual void render() SAL_OVERRIDE;
private:
glm::vec3 maPos;
glm::vec3 maUp;
diff --git a/chart2/source/view/main/3DChartObjects.cxx
b/chart2/source/view/main/3DChartObjects.cxx
index 38279a3..045107b 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -54,6 +54,14 @@ Line::Line(sal_uInt32 nId):
{
}
+void Line::render()
+{
+getRender()->AddShapePolygon3DObject(0, true,
(sal_Int32)maLineColor.GetColor(), 0, 0);
+getRender()->AddPolygon3DObjectPoint(maPosBegin.x, maPosBegin.y,
maPosBegin.z);
+getRender()->AddPolygon3DObjectPoint(maPosEnd.x, maPosEnd.y, maPosEnd.z);
+getRender()->EndAddShapePolygon3DObject();
+}
+
Text::Text(sal_uInt32 nId):
Renderable3DObject(nId)
{
commit 461aa03c95e3297041de4eec8b3d44da348f60e8
Author: xukai
Date: Mon May 5 13:00:46 2014 +0800
remove the codes of set camera info to render()
Change-Id: I9c2aecd5dea617e7cd69c1fc005b6a9ee237f202
diff --git a/chart2/source/view/inc/3DChartObjects.hxx
b/chart2/source/view/inc/3DChartObjects.hxx
index 1fa9402..54b6a24 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -87,6 +87,7 @@ class Camera : public Renderable3DObject
{
public:
Camera();
+virtual void render();
private:
glm::vec3 maPos;
glm::vec3 maUp;
diff --git a/chart2/source/view/main/3DChartObjects.cxx
b/chart2/source/view/main/3DChartObjects.cxx
index 6148f03..38279a3 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -70,9 +70,14 @@ Camera::Camera():
maUp(0, 1, 0),
maDirection(glm::vec3(0,0,0)-maPos)
{
+}
+
+void Camera::render()
+{
getRender()->SetCameraInfo(maPos, maDirection, maUp, true);
}
+
namespace temporary {
TemporaryContext::TemporaryContext():
commit 4e8a9d669f835cb2f1df3efc9b41d86d51af90d7
Author: xukai
Date: Mon May 5 12:25:42 2014 +0800
add codes to set camera info
Change-Id: Id6bac3a8dd46d7994c9e64c9e0c16e8c7ac036ac
diff --git a/chart2/source/view/inc/3DChartObjects.hxx
b/chart2/source/view/inc/3DChartObjects.hxx
index e3165e2..1fa9402 100644
--- a/chart2/source/view/inc/3DChartObjects.hxx
+++ b/chart2/source/view/inc/3DChartObjects.hxx
@@ -89,6 +89,7 @@ public:
Camera();
private:
glm::vec3 maPos;
+glm::vec3 maUp;
glm::vec3 maDirection;
};
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx
b/chart2/source/view/inc/GL3DRenderer.hxx
index b31a5ac..5f66203 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -109,6 +109,7 @@ typedef struct Extrude3DInfo
typedef struct CameraInfo
{
+bool useDefault;
glm::vec3 cameraPos;
glm::vec3 cameraOrg;
glm::vec3 cameraUp;
@@ -179,7 +180,7 @@ public:
void SetClickPos(Point aMPos);
void RenderClickPos(Point aMPos);
void SetSize(const Size& rSize);
-
+void SetCameraInfo(glm::vec3 pos, glm::vec3 direction, glm::vec3 up, bool
useDefalut);
private:
void MoveModelf(PosVecf3& trans,PosVecf3& angle,PosVecf3& scale);
diff --git a/chart2/source/view/main/3DChartObjects.cxx
b/chart2/source/view/main/3DChartObjects.cxx
index f7e0eb7..6148f03 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -67,8 +67,10 @@ Rectangle::Rectangle(sal_uInt32 nId):
Camera::Camera():
Renderable3DObject(0),
maPos(10,10,-10),
+maUp(0, 1, 0),
maDirection(glm::vec3(0,0,0)-maPos)
{
+getRender()->SetCameraInfo(maPos, maDirection, maUp, true);
}
namespace temporary {
diff --git a/chart2/source/view/main/GL3DRenderer.cxx
b/chart2/source/view/main/GL3DRenderer.cxx
[Libreoffice-commits] core.git: vcl/source
vcl/source/opengl/OpenGLContext.cxx | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
New commits:
commit fc4000a9be34304790219f08adfa924801f736e1
Author: Jan Holesovsky
Date: Mon May 5 16:46:59 2014 +0200
openGL: More debug info.
Change-Id: Ia2e09c92673b97fd48c4ede7ebb9ff47da821926
diff --git a/vcl/source/opengl/OpenGLContext.cxx
b/vcl/source/opengl/OpenGLContext.cxx
index 18530ae..5271214 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -435,7 +435,12 @@ bool OpenGLContext::ImplInit()
}
SetPixelFormat(m_aGLWin.hDC,WindowPix,&PixelFormatFront);
m_aGLWin.hRC = wglCreateContext(m_aGLWin.hDC);
-wglMakeCurrent(m_aGLWin.hDC,m_aGLWin.hRC);
+
+if (!wglMakeCurrent(m_aGLWin.hDC,m_aGLWin.hRC))
+{
+SAL_WARN("vcl.opengl", "Failed wglMakeCurrent: " << GetLastError());
+return false;
+}
#elif defined( MACOSX )
@@ -506,9 +511,10 @@ bool OpenGLContext::ImplInit()
if(!bGlewInit)
{
glewExperimental = GL_TRUE;
-if (glewInit() != GLEW_OK)
+GLenum err = glewInit();
+if (err != GLEW_OK)
{
-SAL_WARN("vcl.opengl", "Failed to initialize GLEW");
+SAL_WARN("vcl.opengl", "Failed to initialize GLEW: " <<
glewGetErrorString(err));
return false;
}
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: chart2/source
chart2/source/view/main/OpenGLRender.cxx |2 +-
chart2/source/view/main/OpenGLRender.hxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 0635a9c1906e00c16fd7c5b83720858b73edbae0
Author: Stephan Bergmann
Date: Mon May 5 16:35:44 2014 +0200
Missing const
Change-Id: If1e0e78e1b62c547bd0f03e727e1856227b32821
diff --git a/chart2/source/view/main/OpenGLRender.cxx
b/chart2/source/view/main/OpenGLRender.cxx
index 9bd8e72..bbdf750 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -897,7 +897,7 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool
bFill)
return 0;
}
-int OpenGLRender::CreateTextTexture(::rtl::OUString &textValue, Font aFont,
long , awt::Point aPos, awt::Size aSize, long rotation)
+int OpenGLRender::CreateTextTexture(::rtl::OUString const &textValue, Font
aFont, long , awt::Point aPos, awt::Size aSize, long rotation)
{
VirtualDevice aDevice(*Application::GetDefaultDevice(), 0, 0);
aDevice.Erase();
diff --git a/chart2/source/view/main/OpenGLRender.hxx
b/chart2/source/view/main/OpenGLRender.hxx
index f5c54fa..e88fffa 100644
--- a/chart2/source/view/main/OpenGLRender.hxx
+++ b/chart2/source/view/main/OpenGLRender.hxx
@@ -99,7 +99,7 @@ public:
int CreateTextTexture(const BitmapEx& rBitmapEx,
const com::sun::star::awt::Point& aPos, const
com::sun::star::awt::Size& aSize,
long rotation, const com::sun::star::drawing::HomogenMatrix3&
rTrans);
-int CreateTextTexture(::rtl::OUString &textValue, Font aFont, long
fontColor, awt::Point aPos, awt::Size aSize, long rotation);
+int CreateTextTexture(::rtl::OUString const &textValue, Font aFont, long
fontColor, awt::Point aPos, awt::Size aSize, long rotation);
int RenderTextShape();
int SetArea2DShapePoint(float x, float y, int listLength);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[GSoC 2014] Code pointers for text properties in Draw
Hi all, I'm working on adding text background color to Draw text frames but I suspect I'm having troubles finding my way through the basics of the whole application's architecture. Browsing through code in sd/, I haven't found anything that seemed to deal specifically with text properties. I suppose most of the responsibility for text features is in some external module (editeng, by any chance?), but I don't understand where it is that Draw-specific code makes use of these features. Could anyone point to any documentation/code I could look at or could anyone help me get clarity on this point? Cheers, Matteo ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
LibreOffice fails to build on Mac OS
Hi,
I'm trying to build the current version of LibreOffice on a Mac OS X 10.9.2
with XCode 5.1.1.
After a sync of the current repository I do ./autogen.sh --without-junit and
then make.
The build process usually stops at sw_ooxmlexport, sw_ooxmlimport,
sw_rtfexport or sw_rtfimport.
Error: a unit test failed, please do one of:
export DEBUGCPPUNIT=TRUE# for exception catching
export CPPUNITTRACE="gdb --args"# for interactive debugging on Linux
export CPPUNITTRACE="\"[full path to devenv.exe]\" /debugexe" # for
interactive debugging in Visual Studio
export VALGRIND=memcheck# for memory checking
and retry using: make CppunitTest_sw_rtfexport
make[1]: ***
[/Users/florinochiana/Docs/InstaEdit/core.mac/workdir/CppunitTest/sw_rtfexport.test]
Error 1
Error: a unit test failed, please do one of:
export DEBUGCPPUNIT=TRUE# for exception catching
export CPPUNITTRACE="gdb --args" # for interactive debugging on linux
export CPPUNITTRACE=""[full path to devenv.exe]" /debugexe" # for
interactive debugging in Visual Studio
export VALGRIND=memcheck# for memory checking
and retry using: make CppunitTest_sw_ooxmlimport
make[1]: ***
[/Users/florinochiana/Docs/InstaEdit/core.mac.4.2.4/workdir/CppunitTest/sw_ooxmlimport.test]
Error 1
make[1]: *** Waiting for unfinished jobs
I tried to clone an older version of LibreOffice (4.2.4) and do a build but
that also stopped in the same place.
I tried running make verbose=1 and I see that the lines where these tests
are executed get segmentation fault error or bus error.
/bin/sh: line 1: 14672 Bus error: 10
DYLD_LIBRARY_PATH=${DYLD_LIBRARY_PATH:+$DYLD_LIBRARY_PATH:}"$I/LibreOfficeDev.app/Contents/ure-link/lib:$I/LibreOfficeDev.app/Contents/MacOS":$W/LinkTarget/Library:$W/UnpackedTarball/cppunit/src/cppunit/.libs
$W/LinkTarget/Executable/cppunittester
$W/LinkTarget/CppunitTest/libtest_sw_ooxmlimport.dylib --headless
"-env:BRAND_BASE_DIR=file://$I/LibreOfficeDev.app/Contents"
"-env:BRAND_SHARE_SUBDIR=share"
"-env:UserInstallation=file://$W/CppunitTest/sw_ooxmlimport.test.user"
"-env:CONFIGURATION_LAYERS=xcsxcu:file://$I/LibreOfficeDev.app/Contents/share/registry
xcsxcu:file://$W/unittest/registry"
"-env:UNO_TYPES=file://$I/LibreOfficeDev.app/Contents/MacOS/types/offapi.rdb
file://$I/LibreOfficeDev.app/Contents/ure-link/share/misc/types.rdb"
"-env:UNO_SERVICES=file://$W/Rdb/ure/services.rdb
file://$W/ComponentTarget/basic/util/sb.component
file://$W/ComponentTarget/chart2/source/controller/chartcontroller.component
file://$W/ComponentTarget/chart2/source/chartcore.component
file://$W/ComponentTarget/canvas/source/factory/canvasfactory.component
file://$W/ComponentTarget/comphelper/util/comphelp.component
file://$W/ComponentTarget/configmgr/source/configmgr.component
file://$W/ComponentTarget/drawinglayer/drawinglayer.component
file://$W/ComponentTarget/embeddedobj/util/embobj.component
file://$W/ComponentTarget/filter/source/config/cache/filterconfig1.component
file://$W/ComponentTarget/forms/util/frm.component
file://$W/ComponentTarget/framework/util/fwk.component
file://$W/ComponentTarget/i18npool/util/i18npool.component
file://$W/ComponentTarget/linguistic/source/lng.component
file://$W/ComponentTarget/oox/util/oox.component
file://$W/ComponentTarget/package/source/xstor/xstor.component
file://$W/ComponentTarget/package/util/package2.component
file://$W/ComponentTarget/sax/source/expatwrap/expwrap.component
file://$W/ComponentTarget/sw/util/sw.component
file://$W/ComponentTarget/sw/util/swd.component
file://$W/ComponentTarget/sw/util/msword.component
file://$W/ComponentTarget/sfx2/util/sfx.component
file://$W/ComponentTarget/starmath/util/sm.component
file://$W/ComponentTarget/svl/source/fsstor/fsstorage.component
file://$W/ComponentTarget/svl/util/svl.component
file://$W/ComponentTarget/svtools/util/svt.component
file://$W/ComponentTarget/svx/util/svx.component
file://$W/ComponentTarget/svx/util/svxcore.component
file://$W/ComponentTarget/toolkit/util/tk.component
file://$W/ComponentTarget/ucb/source/core/ucb1.component
file://$W/ComponentTarget/ucb/source/ucp/file/ucpfile1.component
file://$W/ComponentTarget/unotools/util/utl.component
file://$W/ComponentTarget/unoxml/source/service/unoxml.component
file://$W/ComponentTarget/writerfilter/util/writerfilter.component
file://$W/ComponentTarget/xmloff/util/xo.component"
-env:URE_INTERNAL_LIB_DIR=file://$I/LibreOfficeDev.app/Contents/ure-link/lib
-env:LO_LIB_DIR=file://$I/LibreOfficeDev.app/Contents/MacOS
-env:LO_JAVA_DIR=file://$I/LibreOfficeDev.app/Contents/MacOS/classes
--protector $W/LinkTarget/Library/unoexceptionprotector.dylib
unoexceptionprotector --protector
$W/LinkTarget/Library/unobootstrapprotector.dylib unobootstrapprotector >
$W/CppunitTest/sw_ooxmlimport.test.log 2>&1
I tried searching the web for these errors but found nothing. Anyone knows
what else I can try?
Thank you
--
View this message in context:
http://nabble.documentfoundation.org
Need help handling "quoteright" key shortcut for Mac OS X.
Hi there,
This commit
http://cgit.freedesktop.org/libreoffice/core/commit/?id=dd9c9a69da7b22c4166391df082ac23878312a01
introduces the single quote key (') as a key that can be assigned a
shortcut. To do that I had to add KEY_QUOTERIGHT handling to X11, GTK
and Windows platform specific parts of VCL. But I still need help
getting the Mac part handled. From a simple code-reading, this file
vcl/osx/salframeview.mm appears to be the file that needs modified, but
I don't feel comfortable editing this part since I can't test my own
change (I don't own a Mac).
Anyone interested in getting this covered for Mac?
TIA,
Kohei
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sal/textenc
sal/textenc/handleundefinedunicodetotextchar.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 51bfb3a5af91dcd17ebc4c52845e77f530f05c6d
Author: Markus Mohrhard
Date: Mon May 5 02:29:55 2014 +0200
Asan: fix invalid memory access
Change-Id: I7a2acd99f3a8cb143c2ad1c978dfa4b02bf54464
Signed-off-by: Stephan Bergmann
diff --git a/sal/textenc/handleundefinedunicodetotextchar.cxx
b/sal/textenc/handleundefinedunicodetotextchar.cxx
index 6ea1dad..7ff7bd0 100644
--- a/sal/textenc/handleundefinedunicodetotextchar.cxx
+++ b/sal/textenc/handleundefinedunicodetotextchar.cxx
@@ -108,7 +108,7 @@ bool sal::detail::textenc::handleUndefinedUnicodeToTextChar(
/* one replacement character */
if (ImplIsHighSurrogate(c))
{
-if ( *ppSrcBuf == pEndSrcBuf )
+if ( ((*ppSrcBuf) + 1) == pEndSrcBuf )
{
*pInfo |= RTL_UNICODETOTEXT_INFO_ERROR |
RTL_UNICODETOTEXT_INFO_SRCBUFFERTOSMALL;
return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: oox/source
oox/source/shape/WpsContext.cxx | 31 ++-
1 file changed, 18 insertions(+), 13 deletions(-)
New commits:
commit 315503314aaeed11d1e25d5a379d56fd3051dba0
Author: Miklos Vajna
Date: Mon May 5 14:11:45 2014 +0200
oox: don't try to set Writer-specific properties on non-TextFrames...
... during DOCX import of shapes with text, so that we don't crash when
the currently always active
setServiceName("com.sun.star.text.TextFrame") call is not present.
Change-Id: I5b005583ddcee81b9683e3b34e8f0a2e5faa4f95
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 5723709..fa17304 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -73,20 +73,24 @@ oox::core::ContextHandlerRef
WpsContext::onCreateContext(sal_Int32 nElementToken
}
}
-// Handle inset attributes for Writer textframes.
-sal_Int32 aInsets[] = { XML_lIns, XML_tIns, XML_rIns, XML_bIns };
-boost::optional oInsets[4];
-for (size_t i = 0; i < SAL_N_ELEMENTS(aInsets); ++i)
+uno::Reference xServiceInfo(mxShape,
uno::UNO_QUERY);
+uno::Reference xPropertySet(mxShape,
uno::UNO_QUERY);
+if (xServiceInfo.is() &&
xServiceInfo->supportsService("com.sun.star.text.TextFrame"))
{
-OptValue oValue = rAttribs.getString(aInsets[i]);
-if (oValue.has())
-oInsets[i] = oox::drawingml::GetCoordinate(oValue.get());
+// Handle inset attributes for Writer textframes.
+sal_Int32 aInsets[] = { XML_lIns, XML_tIns, XML_rIns, XML_bIns
};
+boost::optional oInsets[4];
+for (size_t i = 0; i < SAL_N_ELEMENTS(aInsets); ++i)
+{
+OptValue oValue = rAttribs.getString(aInsets[i]);
+if (oValue.has())
+oInsets[i] =
oox::drawingml::GetCoordinate(oValue.get());
+}
+OUString aProps[] = { OUString("LeftBorderDistance"),
OUString("TopBorderDistance"), OUString("RightBorderDistance"),
OUString("BottomBorderDistance") };
+for (size_t i = 0; i < SAL_N_ELEMENTS(aProps); ++i)
+if (oInsets[i])
+xPropertySet->setPropertyValue(aProps[i],
uno::makeAny(*oInsets[i]));
}
-OUString aProps[] = { OUString("LeftBorderDistance"),
OUString("TopBorderDistance"), OUString("RightBorderDistance"),
OUString("BottomBorderDistance") };
-uno::Reference xPropertySet(mxShape,
uno::UNO_QUERY);
-for (size_t i = 0; i < SAL_N_ELEMENTS(aProps); ++i)
-if (oInsets[i])
-xPropertySet->setPropertyValue(aProps[i],
uno::makeAny(*oInsets[i]));
// Handle text vertical adjustment inside a text frame
if (rAttribs.hasAttribute(XML_anchor))
@@ -100,11 +104,12 @@ oox::core::ContextHandlerRef
WpsContext::onCreateContext(sal_Int32 nElementToken
case XML_noAutofit:
case XML_spAutoFit:
{
+uno::Reference xServiceInfo(mxShape,
uno::UNO_QUERY);
// We can't use oox::drawingml::TextBodyPropertiesContext here, as this
// is a child context of bodyPr, so the shape is already sent: we need
// to alter the XShape directly.
uno::Reference xPropertySet(mxShape,
uno::UNO_QUERY);
-if (xPropertySet.is())
+if (xPropertySet.is() &&
xServiceInfo->supportsService("com.sun.star.text.TextFrame"))
xPropertySet->setPropertyValue("FrameIsAutomaticHeight",
uno::makeAny(getBaseToken(nElementToken) == XML_spAutoFit));
}
break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: configure.ac
configure.ac |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7623bc31584b38da980016db25fb5dfc702beb10
Author: Tomofumi Yagi
Date: Sun May 4 11:34:24 2014 +0900
fix windows build(external/poppler)
Fix build error on windows with --enable-dbgutil autogen.sh option.
We need to link freetype248_D.lib,when we use --enable-dbgutil option.
(Suffix "_D" is needed.)
Change-Id: Ib2927e777d9b9bb615e1df62e428cf17cc8bc26e
Reviewed-on: https://gerrit.libreoffice.org/9248
Tested-by: Michael Stahl
Reviewed-by: Michael Stahl
diff --git a/configure.ac b/configure.ac
index 2e4e3b3..256efe9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10404,7 +10404,8 @@ if test $_os != iOS -a $_os != Android -a $_os !=
Darwin -a "x$enable_gltf" != "
if test "$test_freetype" = "no"; then
BUILD_TYPE="$BUILD_TYPE FREETYPE"
if test "$COM" = "MSC"; then
-
FREETYPE_LIBS="${WORKDIR}/UnpackedTarball/freetype/objs/win32/vc2010/freetype248.lib"
+test -n "${MSVC_USE_DEBUG_RUNTIME}" &&
FREETYPE_LIB_DEBUGLIB_SUFFIX="_D"
+
FREETYPE_LIBS="${WORKDIR}/UnpackedTarball/freetype/objs/win32/vc2010/freetype248$FREETYPE_LIB_DEBUGLIB_SUFFIX.lib"
fi
fi
else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[SOLVED] Re: Questions about getCppuType
sberg wrote > ... > With cppu::UnoType, instead use cppu::UnoUnsignedShortType and > cppu::UnoCharType as template arguments, respectively. (And do get rid > of the useless "const" in the template arguments.) Thank you Stephan for your feedback, I'll use these and remove const for all the replacements (not only those with sal_uInt16) Julien -- View this message in context: http://nabble.documentfoundation.org/Questions-about-getCppuType-tp4106361p4107641.html Sent from the Dev mailing list archive at Nabble.com. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: desktop/inc desktop/source include/vcl vcl/source
desktop/inc/app.hxx |1 desktop/source/app/app.cxx |1 include/vcl/svapp.hxx| 32 ++ include/vcl/window.hxx |2 + vcl/source/app/svapp.cxx | 52 +-- vcl/source/outdev/map.cxx| 11 + vcl/source/window/window.cxx | 48 +++ 7 files changed, 76 insertions(+), 71 deletions(-) New commits: commit b4107411900f5bb4c215e2d9db09fc2b2b82939b Author: Miklos Vajna Date: Mon May 5 11:54:16 2014 +0200 Revert "Move ImplInitAppFontData from Window to Application" This reverts commit f76026a43acc65465882924796d93e635c35fd90. This brings back the paragraph style and font name combo boxes in Writer. Change-Id: Idb28253797ef842d575fe10537f6e70faa34fe75 diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 8b8affe..67fc3fb 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -128,7 +128,6 @@ class Desktop : public Application // throws an exception upon failure private: - voidRegisterServices( css::uno::Reference< css::uno::XComponentContext > const & context); voidDeregisterServices(); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 5f4b3bb..377afc7 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1493,7 +1493,6 @@ int Desktop::Main() the main thread is not yet in the event loop. */ Application::GetDefaultDevice(); -InitAppFontData(); #if HAVE_FEATURE_EXTENSIONS // Check if bundled or shared extensions were added /removed diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index ddf5c63..1b8f6e1 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -265,12 +265,6 @@ public: */ virtual voidInit(); -protected: -/** Initialize font data for the application. - */ -virtual voidInitAppFontData(); - -public: /** Finish initialization of the application. @see Init, DeInit @@ -354,7 +348,7 @@ public: @returns true if exited successfully, false if not able to fully exit */ -virtual boolQueryExit(); +virtual bool QueryExit(); /** Send user event. @@ -632,7 +626,7 @@ public: @see IsInExecute, IsInModalMode */ -static bool IsInMain(); +static bool IsInMain(); /** Queries whether the application is in the event loop @@ -640,7 +634,7 @@ public: @see IsInMain, IsInModalMode */ -static bool IsInExecute(); +static bool IsInExecute(); /** Queries whether application has a modal dialog active. @@ -648,7 +642,7 @@ public: @see IsInMain, IsInExecute */ -static bool IsInModalMode(); +static bool IsInModalMode(); /** Return how many events are being dispatched. @@ -685,7 +679,7 @@ public: @returns true if UI is captured, false if not */ -static bool IsUICaptured(); +static bool IsUICaptured(); /** @name Settings @@ -842,7 +836,7 @@ public: @see PostKeyEvent */ -static bool HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); +static bool HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); /** Send keypress event @@ -908,7 +902,7 @@ public: @return true if there is a default window and the event could be posted to it successfully. */ -static bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); +static bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); /** Remove user event based on event ID @@ -926,7 +920,7 @@ public: @return true if the handler was inserted successfully, false if it couldn't be inserted. */ -static bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); +static bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); /** Remove an idle handler from the application. @@ -1179,7 +1173,7 @@ public: @see RemoveAccel */ -static bool InsertAccel( Accelerator* pAccel ); +static bool InsertAccel( Accelerator* pAccel ); /** Remove accelerator @@ -1203,7 +1197,7 @@ public: @see EnableAutoMnemonic */ -static bool IsAutoMnemonicEnabled(); +static bool IsAutoMnemonicEnabled(); /** Get the number of reserved key codes used by the application. @@ -1264,7 +1258,7 @@ public: @see EnableAutoHelpId */ -static bool IsAutoHelpIdEnab
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8f08def4aefc6b92366536fb1fb6620527474129 Author: Thomas Arnhold Date: Mon May 5 10:45:40 2014 +0200 Updated core Project: help ada56299c9e1c2d2cf36a475fc4e746bf5977354 diff --git a/helpcontent2 b/helpcontent2 index 400d351..ada5629 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 400d3515694ff3857f253c8da9ea44b962161ee0 +Subproject commit ada56299c9e1c2d2cf36a475fc4e746bf5977354 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: 4 commits - helpers/help_hid.lst source/auxiliary source/text
helpers/help_hid.lst| 271 source/auxiliary/scalc.tree |3 source/auxiliary/simpress.tree |3 source/auxiliary/swriter.tree |2 source/text/shared/01/digitalsignatures.xhp |4 source/text/shared/01/securitywarning.xhp |1 6 files changed, 1 insertion(+), 283 deletions(-) New commits: commit ada56299c9e1c2d2cf36a475fc4e746bf5977354 Author: Thomas Arnhold Date: Mon May 5 10:45:40 2014 +0200 remove some obsolete comments diff --git a/source/auxiliary/scalc.tree b/source/auxiliary/scalc.tree index fbaf76d..41a7455 100644 --- a/source/auxiliary/scalc.tree +++ b/source/auxiliary/scalc.tree @@ -116,7 +116,6 @@ Applying Filters Filter: Applying Advanced Filters - Applying AutoFilter Applying Sort Lists @@ -129,7 +128,6 @@ Defining Database Ranges Filtering Cell Ranges - Sorting Data @@ -176,7 +174,6 @@ Unprotecting Cells - Deactivating Automatic Changes Consolidating Data Applying Goal Seek diff --git a/source/auxiliary/simpress.tree b/source/auxiliary/simpress.tree index b27417c..1ac37ba 100644 --- a/source/auxiliary/simpress.tree +++ b/source/auxiliary/simpress.tree @@ -146,8 +146,6 @@ Moving Objects to a Different Layer - - Adding Text Converting Text Characters into Drawing Objects @@ -155,7 +153,6 @@ Creating a Custom Slide Show Changing the Slide Order Zooming With the Keypad - Rehearse Timings of Slide Changes diff --git a/source/auxiliary/swriter.tree b/source/auxiliary/swriter.tree index 5afecb0..663d7db 100644 --- a/source/auxiliary/swriter.tree +++ b/source/auxiliary/swriter.tree @@ -165,7 +165,6 @@ Defining Different Headers and Footers Inserting a Chapter Name and Number in a Header or a Footer Querying User Data in Fields or Conditions - Inserting and Editing Footnotes or Endnotes Spacing Between Footnotes About Headers and Footers @@ -204,7 +203,6 @@ Inserting Text Before a Table at the Top of Page Going to Specific Bookmark - Saving Text Documents in HTML Format commit 03927063275bd08b7b109f30aeafb9ffeda77a14 Author: Thomas Arnhold Date: Mon May 5 10:43:58 2014 +0200 unused floating window RID_SVXTBX_GRFFILTER diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 8ac8531..6f2fe9c 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -1817,18 +1817,6 @@ HID_GLBLTREE_UPD_SEL,53032, HID_GLOBAL_FALLBACK,4294967295, HID_GLOS_GROUP_TREE,53021, HID_GRAFIK_TOOLBOX,54830, -HID_GRFFILTER,34148, -HID_GRFFILTER_EMBOSS,34155, -HID_GRFFILTER_INVERT,34149, -HID_GRFFILTER_MOSAIC,34154, -HID_GRFFILTER_POPART,34157, -HID_GRFFILTER_POSTER,34156, -HID_GRFFILTER_REMOVENOISE,34152, -HID_GRFFILTER_SEPIA,34158, -HID_GRFFILTER_SHARPEN,34151, -HID_GRFFILTER_SMOOTH,34150, -HID_GRFFILTER_SOBEL,34153, -HID_GRFFILTER_SOLARIZE,34159, HID_GRIDWIZARD_CANCEL,34811, HID_GRIDWIZARD_FINISH,34812, HID_GRIDWIZARD_NEXT,34810, commit 791fd129cf3f2852a828b90830b5312944436105 Author: Thomas Arnhold Date: Mon May 5 10:05:05 2014 +0200 remove unused hids fallout from core 702f9c5176eebb95c5a1bfd31c1f256b79301b19 diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst index 7c64e53..8ac8531 100644 --- a/helpers/help_hid.lst +++ b/helpers/help_hid.lst @@ -732,7 +732,6 @@ HID_APP_VIEW_PREVIEW_1,39045, HID_APP_VIEW_PREVIEW_2,39046, HID_APP_VIEW_PREVIEW_3,39050, HID_APP_VIEW_PREVIEW_CB,39044, -HID_APP_WIN,33128, HID_AUTH_FIELD_ADDRESS,54882, HID_AUTH_FIELD_ANNOTE,54883, HID_AUTH_FIELD_AUTHOR,54884, @@ -764,24 +763,6 @@ HID_AUTH_FIELD_TITLE,54900, HID_AUTH_FIELD_URL,54904, HID_AUTH_FIELD_VOLUME,54902, HID_AUTH_FIELD_YEAR,54903, -HID_AUTOCORR_HELP_ACORSENTWORD,34104, -HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH,34112, -HID_AUTOCORR_HELP_ACORWORD,34102, -HID_AUTOCORR_HELP_ACORWORDENEMDASH,34110, -HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL,34119, -HID_AUTOCORR_HELP_CHGORDINALNUMBER,34120, -HID_AUTOCORR_HELP_CHGQUOTES,34114, -HID_AUTOCORR_HELP_CHGSGLQUOTES,34115, -HID_AUTOCORR_HELP_CHGTOENEMDASH,34106, -HID_AUTOCORR_HELP_CHGWEIGHTUNDERL,34118, -HID_AUTOCORR_HELP_INGNOREDOUBLESPACE,34117, -HID_AUTOCORR_HELP_SENT,34100, -HID_AUTOCORR_HELP_SENTENEMDASH,34108, -HID_AUTOCORR_HELP_SENTWORD,34101, -HID_AUTOCORR_HELP_SENTWORDENEMDASH,34109, -HID_AUTOCORR_HELP_SETINETATTR,34116, -HID_AUTOCORR_HELP_WORD,34099, -HID_AUTOCORR_HELP_WORDENEMDASH,34107, HID_AUTOFORMAT_ACCEPT,54854, HID_AUTOFORMAT_CLB,52827, HID_AUTOFORMAT_CLOSE,52834, @@ -810,11 +791,8 @@ HID_BASICIDE_BRKDLG,63556, HID_BASICIDE_BRKPROPS,63558, HID_BASICIDE_DIALOGWINDOW,63562, HID_BASICIDE_EDITORWINDOW,63563, -HID_BASICIDE_LIBS,63545, HID_BASICIDE_MODULWINDOW,63561, -HID_BASICIDE_OBJCAT_SHOW,63553, HID_BASICIDE_OBJECTCAT,
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/text.cxx |4
1 file changed, 4 insertions(+)
New commits:
commit 304b3b3910bb472d663baaa789970df55ceeb09e
Author: Stephan Bergmann
Date: Mon May 5 10:50:22 2014 +0200
Handle GetTextBreak returning -1
I don't know what the root cause is exactly that made at least Mac OS X
--enable-dbgutil JunitTest_forms_unoapi start to fail recently, but when
nWidth
is just 1 (which might be the root of the problem here, but could probably
also
legitimately be the case) and GetTextWidth returns -1 (which it probably is
allowed to do), this would lead to an out-of-bounds OUString::operator[]
access
at
> rtl::OUString::operator[] (this=0x118a04be0, index=-1) at ustring.hxx:421
> com::sun::star::i18n::BreakIterator_Unicode::getLineBreak
(this=0x11986f6f8, Text=@0x118a04be0, nStartPos=-2, rLocale=@0x7fbd83821d98,
nMinBreakPos=4, hOptions=@0x118a04620) at
i18npool/source/breakiterator/breakiterator_unicode.cxx:429
> com::sun::star::i18n::BreakIteratorImpl::getLineBreak (this=0x1112d5c98,
Text=@0x118a04be0, nStartPos=-1, rLocale=@0x7fbd83821d98, nMinBreakPos=4,
hOptions=@0x118a04620, bOptions=@0x118a045f8) at
i18npool/source/breakiterator/breakiteratorImpl.cxx:242
> OutputDevice::ImplGetTextLines (rLineInfo=@0x118a04bb0, nWidth=1,
rStr=@0x118a04be0, nStyle=12560, _rLayout=@0x118a04db8) at
vcl/source/outdev/text.cxx:527
> OutputDevice::ImplDrawText (this=0x7fbd8302d000,
rTargetDevice=@0x7fbd8302d000, rRect=@0x118a05058, rOrigStr=@0x118a04f70,
nStyle=12560, pVector=0x0, pDisplayText=0x0, _rLayout=@0x118a04db8) at
vcl/source/outdev/text.cxx:1500
> OutputDevice::DrawText (this=0x7fbd8302d000, rRect=@0x118a05058,
rOrigStr=@0x118a04f70, nStyle=12560, pVector=0x0, pDisplayText=0x0,
_pTextLayout=0x0) at vcl/source/outdev/text.cxx:1754
> sfx2::TitledDockingWindow::Paint (this=0x7fbd8302d000,
i_rArea=@0x118a051d0) at sfx2/source/dialog/titledockwin.cxx:218
Change-Id: I95c6027e86b9a608fe9eb05ffb83fb2316c175f2
diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index bb9fbc1..af9eb1b 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -521,6 +521,10 @@ long OutputDevice::ImplGetTextLines(
ImplMultiTextLineInfo& rLineInfo,
{
const css::lang::Locale&
rDefLocale(Application::GetSettings().GetUILanguageTag().getLocale());
sal_Int32 nSoftBreak = _rLayout.GetTextBreak( rStr,
nWidth, nPos, nBreakPos - nPos );
+if (nSoftBreak == -1)
+{
+nSoftBreak = nPos;
+}
DBG_ASSERT( nSoftBreak < nBreakPos, "Break?!" );
css::i18n::LineBreakHyphenationOptions aHyphOptions(
xHyph, css::uno::Sequence (), 1 );
css::i18n::LineBreakUserOptions aUserOptions;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Help: Get and setting document level user variables doesn’t working before LibreOffice version 4.2.1.1.
Dear Libreoffice developer community,
I have just started maintaining one libreoffice plug-in, it has following code
which were working before LibreOffice version 4.2.1.1. This code is used to
store and retrieve document level information:
'
' FUNCTION: SetUserVariable
' Set Info to the current Document
' Returns: Status;Success or Failure
' Arguments:oDocument Document Object to which info will be stored
' iIndex Index of the Variable where info will get stored
' sVarName
Varaible Name to be stored
' aValue
Value to be stored
'
Function SetUserVariable(ByVal oDocument As Object, ByVal iIndex As Integer,
ByVal sVarName As String, ByVal aValue As Variant) As Boolean
Dim oDocumentInfo As Object
Dim iCnt As Integer
On Error GoTo ErrHandler
If Not IsNull(oDocument) Then
SetUserVariable = False
oDocumentInfo = oDocument.getDocumentInfo()
iCnt = oDocumentInfo.getUserFieldCount()
If iIndex < iCnt Then
oDocumentInfo.setUserFieldName(iIndex, sVarName)
oDocumentInfo.setUserFieldValue(iIndex, aValue)
SetUserVariable = True 'Success
Exit Function
End If
End If
Exit Function
ErrHandler:
LogError("DECOSDIRECT.SetUserVariable", Error$, Erl)
SetUserVariable = False
End Function
'
' FUNCTION: GetUserVariable
' Get Info of the current Document
' Returns: Status;Success or Failure and Document Info
' Arguments:oDocument Document Object to which info will be stored
' iIndex Index of the Variable where info will get stored
' sVarName
Varaible Name to be stored
' aValue
Value which will be returened
'
Function GetUserVariable(ByVal oDocument As Object, ByVal iIndex As Integer,
ByVal sVariable As String, ByRef sValue As Variant) As Boolean
Dim vCount As Integer
Dim oDocumentInfo As Object
Dim iCnt As Integer
On Error GoTo ErrHandler
If Not IsNull(oDocument) Then
oDocumentInfo = oDocument.getDocumentInfo()
iCnt = oDocumentInfo.getUserFieldCount()
If iIndex < iCnt Then
If sVariable =
oDocumentInfo.getUserFieldName(iIndex) Then
sValue =
oDocumentInfo.getUserFieldValue(iIndex)
GetUserVariable
= True
Else
GetUserVariable
= False
End If
End If
End If
Exit Function
ErrHandler:
LogError("DECOSDIRECT.GetUserVariable", Error$, Erl)
GetUserVariable = False
End Function
Here, oDocument is ‘thisComponent’. In above code red marked methods doesn’t
working before LibreOffice version 4.2.1.1. Can you please help us to provide
updated API or alternative solution.
The following API not working with latest version of LibreOffice:
oDocumentInfo = oDocument.getDocumentInfo()
iCnt = oDocumentInfo.getUserFieldCount()
oDocumentInfo.getUserFieldName(iIndex)
and
oDocumentInfo.getUserFieldValue(iIndex)
It’s found that these methods/API are depreciated, can you provide new API
calls that are necessary to add user properties to a file/document?
Thanks & Regards,
Nikunj Banker
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] mso-dumper.git: 2 commits - msodumper/docrecord.py
msodumper/docrecord.py | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
New commits:
commit 8f9c1fcdc12ccfcaf952d523c7238315f617c19d
Author: Miklos Vajna
Date: Mon May 5 11:07:01 2014 +0200
dump sprmPHugePapx
diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index fe4bf4b..6904c5e 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -1299,6 +1299,10 @@ class Sprm(DOCDirStream):
self.operand = self.getuInt32()
if self.sprm == 0x6a03 and transformed == r"\x01":
self.ct = PICFAndOfficeArtData(self)
+elif self.sprm == 0x6646: # sprmPHugePapx
+dataStream = mainStream.doc.getDirectoryStreamByName("Data")
+dataStream.pos = self.operand
+self.ct = PrcData(dataStream)
elif self.getOperandSize() == 7:
self.operand = self.getuInt64() & 0x0fff
elif self.getOperandSize() == 9:
commit b3c65365b1a8be1a521d103b832809ed28eafbcf
Author: Miklos Vajna
Date: Mon May 5 11:02:18 2014 +0200
doc: make mainStream available in Sprms
diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index 7b9dcfc..fe4bf4b 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -1406,8 +1406,8 @@ class Prl(DOCDirStream):
class GrpPrlAndIstd(DOCDirStream):
"""The GrpPrlAndIstd structure specifies the style and properties that are
applied to a paragraph, a table row, or a table cell."""
-def __init__(self, bytes, offset, size):
-DOCDirStream.__init__(self, bytes)
+def __init__(self, bytes, offset, size, mainStream=None):
+DOCDirStream.__init__(self, bytes, mainStream=mainStream)
self.pos = offset
self.size = size
@@ -1417,7 +1417,7 @@ class GrpPrlAndIstd(DOCDirStream):
self.printAndSet("istd", self.getuInt16())
pos += 2
while (self.size - (pos - self.pos)) > 0:
-prl = Prl(self, pos)
+prl = Prl(self, pos, mainStream=self.mainStream)
prl.dump()
pos += prl.getSize()
print ''
@@ -1451,7 +1451,7 @@ class Chpx(DOCDirStream):
class PapxInFkp(DOCDirStream):
"""The PapxInFkp structure specifies a set of text properties."""
def __init__(self, bytes, mainStream, offset):
-DOCDirStream.__init__(self, bytes)
+DOCDirStream.__init__(self, bytes, mainStream=mainStream)
self.pos = offset
def dump(self):
@@ -1459,9 +1459,9 @@ class PapxInFkp(DOCDirStream):
self.printAndSet("cb", self.readuInt8())
if self.cb == 0:
self.printAndSet("cb_", self.readuInt8())
-grpPrlAndIstd = GrpPrlAndIstd(self.bytes, self.pos, 2 * self.cb_)
+grpPrlAndIstd = GrpPrlAndIstd(self.bytes, self.pos, 2 * self.cb_,
mainStream=self.mainStream)
else:
-grpPrlAndIstd = GrpPrlAndIstd(self.bytes, self.pos, self.cb)
+grpPrlAndIstd = GrpPrlAndIstd(self.bytes, self.pos, self.cb,
mainStream=self.mainStream)
grpPrlAndIstd.dump()
print ''
@@ -1471,7 +1471,7 @@ class BxPap(DOCDirStream):
size = 13 # in bytes, see 2.9.23
def __init__(self, bytes, mainStream, offset, parentoffset):
-DOCDirStream.__init__(self, bytes)
+DOCDirStream.__init__(self, bytes, mainStream=mainStream)
self.pos = offset
self.parentpos = parentoffset
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Windows TinderBoxes of Master need attention
Hi Stuart, V Stuart Foote píše v Pá 02. 05. 2014 v 20:24 +: > Thanks, but that "give a little love" was from the last TB's off-line cycle > in February =) Ah! Was searching the list if anybody is complaining about the recent breakage, and did not check the date ;-) > Issue is in there somewhere. Markus has fixed the problems there - thank you, Moggi!, @38, @39 and other Windows ones are green again. All the best, Kendy ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] mso-dumper.git: msodumper/docrecord.py
msodumper/docrecord.py | 23 +++
1 file changed, 23 insertions(+)
New commits:
commit d68a41972acc9414a5316e61e2d3e7975026f351
Author: Miklos Vajna
Date: Mon May 5 10:32:28 2014 +0200
dump TableBordersOperand80
diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index 63d3744..7b9dcfc 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -1212,6 +1212,27 @@ class TableBordersOperand(DOCDirStream):
print ''
+class TableBordersOperand80(DOCDirStream):
+"""The TableBordersOperand80 structure is an operand that specifies the
+borders which are applied to a row of table cells."""
+def __init__(self, parent):
+DOCDirStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+
+def dump(self):
+print ''
+self.printAndSet("cb", self.readuInt8())
+posOrig = self.pos
+Brc80MayBeNil(self, "brcTop").dump()
+Brc80MayBeNil(self, "brcLeft").dump()
+Brc80MayBeNil(self, "brcBottom").dump()
+Brc80MayBeNil(self, "brcRight").dump()
+Brc80MayBeNil(self, "brcHorizontalInside").dump()
+Brc80MayBeNil(self, "brcVerticalInside").dump()
+assert self.pos == posOrig + 0x18
+print ''
+
+
class SHDOperand(DOCDirStream):
"""The SDHOperand structure is an operand that is used by several Sprm
structures to specify the background shading to be applied."""
@@ -1301,6 +1322,8 @@ class Sprm(DOCDirStream):
self.ct = SHDOperand(self)
elif self.sprm == 0xd613:
self.ct = TableBordersOperand(self)
+elif self.sprm == 0xd605:
+self.ct = TableBordersOperand80(self)
else:
print '' % (self.getOperandSize(), hex(self.sprm))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
WB_3DLOOK
Hi all, I have been review the Window classes in VCL and I noticed a window style WB_3DLOOK. It appears to set * the window button colour and the window text color - see http://opengrok.libreoffice.org/xref/core/vcl/source/window/window.cxx#1144 * face colour for split windows, docking windows and toolboxes - see http://opengrok.libreoffice.org/xref/core/vcl/source/window/splitwin.cxx#1343 and http://opengrok.libreoffice.org/xref/core/vcl/source/window/dockwin.cxx#357 and also http://opengrok.libreoffice.org/xref/core/vcl/source/window/toolbox.cxx#551 I guess my question is: is this still desirable behaviour? Do we still want to specify a 3D or non-3D look in the window style? Almost everything sets it to on anyway from what I can see. Chris___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] mso-dumper.git: msodumper/docrecord.py
msodumper/docrecord.py | 31 ---
1 file changed, 28 insertions(+), 3 deletions(-)
New commits:
commit ace8c2bce95132942b7116a92cf3ac97742ffcae
Author: Miklos Vajna
Date: Mon May 5 09:51:34 2014 +0200
dump TableBordersOperand
diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index 61512d7..63d3744 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -434,9 +434,11 @@ class COLORREF(DOCDirStream):
class BRC(DOCDirStream):
"""The Brc structure specifies a border."""
-def __init__(self, parent):
+def __init__(self, parent, name="brc"):
DOCDirStream.__init__(self, parent.bytes)
self.pos = parent.pos
+self.parent = parent
+self.name = name
self.posOrig = self.pos
self.cv = COLORREF(self)
self.dptLineWidth = self.readuInt8()
@@ -448,7 +450,7 @@ class BRC(DOCDirStream):
self.fReserved = (buf & 0xff80) >> 7 # 8..16th bits
def dump(self):
-print '' % self.posOrig
+print '<%s type="BRC" offset="%d">' % (self.name, self.posOrig)
self.cv.dump("cv")
self.printAndSet("dptLineWidth", self.dptLineWidth)
self.printAndSet("brcType", self.brcType, dict=BrcType)
@@ -456,7 +458,8 @@ class BRC(DOCDirStream):
self.printAndSet("fShadow", self.fShadow)
self.printAndSet("fFrame", self.fFrame)
self.printAndSet("fReserved", self.fReserved)
-print ''
+print '' % self.name
+self.parent.pos = self.pos
class PChgTabsDel(DOCDirStream):
@@ -1189,6 +1192,26 @@ class TDefTableOperand(DOCDirStream):
print ''
+class TableBordersOperand(DOCDirStream):
+"""The TableBordersOperand structure specifies a set of borders for a
table row."""
+def __init__(self, parent):
+DOCDirStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+
+def dump(self):
+print ''
+self.printAndSet("cb", self.readuInt8())
+posOrig = self.pos
+BRC(self, "brcTop").dump()
+BRC(self, "brcLeft").dump()
+BRC(self, "brcBottom").dump()
+BRC(self, "brcRight").dump()
+BRC(self, "brcHorizontalInside").dump()
+BRC(self, "brcVerticalInside").dump()
+assert self.pos == posOrig + 0x30
+print ''
+
+
class SHDOperand(DOCDirStream):
"""The SDHOperand structure is an operand that is used by several Sprm
structures to specify the background shading to be applied."""
@@ -1276,6 +1299,8 @@ class Sprm(DOCDirStream):
self.ct = TDefTableOperand(self)
elif self.sprm == 0xca71:
self.ct = SHDOperand(self)
+elif self.sprm == 0xd613:
+self.ct = TableBordersOperand(self)
else:
print '' % (self.getOperandSize(), hex(self.sprm))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa writerfilter/source
sw/qa/extras/ooxmlexport/data/fdo77727.docx |binary
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12
writerfilter/source/dmapper/DomainMapper.cxx | 14 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 11 ++-
writerfilter/source/dmapper/DomainMapper_Impl.hxx |3 +++
5 files changed, 38 insertions(+), 2 deletions(-)
New commits:
commit 61e8452c62a587b40bf80076642b869cbd1b7ed6
Author: sushil_shinde
Date: Mon Apr 28 17:10:27 2014 +0530
fdo#77727 PAGEBREAK In first paragraph was not rendered and exported.
Case 1: If PAGEBREAK appears in first paragraph, LO was inserting
BreakType_PAGE_BEFORE but since it was first paragraph, PAGEBREAK
was not rendered in LO hence not exported back to docx file properly.
case 2: If PAGEBREAK appears after first run of any paragraph in document
LO was rendering it in wrong paragraph.
case 3: If COLUMNBREAK appears in first paragraph of section, LO was not
rendering and exporting it.
Change-Id: Ic557b3e6f80cfa6dd3eb6b4204be7e6531b9ecbf
Reviewed-on: https://gerrit.libreoffice.org/9191
Reviewed-by: Miklos Vajna
Tested-by: Miklos Vajna
diff --git a/sw/qa/extras/ooxmlexport/data/fdo77727.docx
b/sw/qa/extras/ooxmlexport/data/fdo77727.docx
new file mode 100644
index 000..9f553e2
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo77727.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 2edbd28..44b9aa7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3210,6 +3210,18 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeOLE,
"fdo77759.docx")
"/word/embeddings/oleObject1.xlsx");
}
+DECLARE_OOXMLEXPORT_TEST(testPageBreakInFirstPara,"fdo77727.docx")
+{
+/* Break to next page was not exported if it is in first paragraph of the
section.
+ * Now after fix , LO writes Next Page Break and also preserves tag.
+ */
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+
+assertXPath(pXmlDoc,
"/w:document/w:body/w:p[1]/w:r[2]/w:br","type","page");
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 858bb93..43b382d 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2795,10 +2795,22 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_,
size_t len)
if ( pContext && !pContext->GetFootnote().is() )
{
if (m_pImpl->isBreakDeferred(PAGE_BREAK))
+{
+/* If PAGEBREAK appears in first paragraph of the section
or
+ * after first run of any paragraph then need to split
paragraph
+ * to handle it properly.
+ */
+if (m_pImpl->GetIsFirstParagraphInSection() ||
!m_pImpl->IsFirstRun())
+{
+m_pImpl->m_bIsSplitPara = true;
+
m_pImpl->finishParagraph(m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH));
+lcl_startParagraphGroup();
+}
m_pImpl->GetTopContext()->Insert( PROP_BREAK_TYPE,
uno::makeAny( com::sun::star::style::BreakType_PAGE_BEFORE) );
+}
else if (m_pImpl->isBreakDeferred(COLUMN_BREAK))
{
-if (!m_pImpl->IsFirstRun())
+if (m_pImpl->GetIsFirstParagraphInSection() ||
!m_pImpl->IsFirstRun())
{
mbIsSplitPara = true;
m_pImpl->finishParagraph(m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH));
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a738d83..410b064 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -198,6 +198,7 @@ DomainMapper_Impl::DomainMapper_Impl(
m_bIgnoreNextPara(false),
m_bIgnoreNextTab(false),
m_bFrameBtLr(false),
+m_bIsSplitPara(false),
m_vTextFramesForChaining()
{
@@ -459,7 +460,15 @@ voidDomainMapper_Impl::PushProperties(ContextType eId)
pSectionContext_->SetStart( xTextAppend->getEnd() );
}
}
-m_aPropertyStacks[eId].push( pInsert );
+if(eId == CONTEXT_PARAGRAPH && m_bIsSplitPara)
+{
+m_aPropertyStacks[eId].push( GetTopContextOfType(eId));
+m_bIsSplitPara = false;
+}
+else
+{
+m_aPropertyStacks[eId].push( pInsert );
+}
m_aContextStack.push(eId);
m_pTopContext = m_aPropertyStacks[eId].top();
diff --git a/writerfilter/source/dmapper
Re: Questions about getCppuType
On 04/25/2014 11:06 PM, julien2412 [via Document Foundation Mail Archive] wrote: > I've begun to replace some parts and had this when I've changed this: > else if ( pType == ::getCppuType((const sal_uInt16*)0) ) > into this: > else if ( pType == cppu::UnoType::get() ) That's the problem with getCppuType, that sal_uInt16 (representing UNO UNSIGNED SHORT) and sal_Unicode (representing UNO CHAR) can be typedefs for one and the same type, so getCppuType arbitrarily has to decide for one of those. With cppu::UnoType, instead use cppu::UnoUnsignedShortType and cppu::UnoCharType as template arguments, respectively. (And do get rid of the useless "const" in the template arguments.) Stephan -- View this message in context: http://nabble.documentfoundation.org/Questions-about-getCppuType-tp4106361p4107618.html Sent from the Dev mailing list archive at Nabble.com.___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
