[Libreoffice-commits] core.git: 2 commits - drawinglayer/source include/vcl vcl/source
Caolán McNamara
caolanm at redhat.com
Thu May 2 03:03:32 PDT 2013
drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx | 322 +++++++------
include/vcl/textview.hxx | 4
vcl/source/edit/textview.cxx | 9
3 files changed, 197 insertions(+), 138 deletions(-)
New commits:
commit 92e5232dcbda1696a0e7c05defb3b6a00f4abdd7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu May 2 09:55:04 2013 +0100
double lock drawinglayer statics
move related statics into classes and the make safe static singleton instances
of those clases.
We still have to have the additional mutex (now per singleton) on the
methods that return the buffered data, as it may be modified per
call
Change-Id: I5873ae8271f48a0ebf4b584c1734688b77cd1d42
diff --git a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
index 495c06f..266738a 100644
--- a/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
+++ b/drawinglayer/source/primitive3d/polygontubeprimitive3d.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <boost/noncopyable.hpp>
#include <drawinglayer/primitive3d/polygontubeprimitive3d.hxx>
#include <drawinglayer/attribute/materialattribute3d.hxx>
#include <basegfx/matrix/b3dhommatrix.hxx>
@@ -25,6 +26,7 @@
#include <basegfx/polygon/b3dpolypolygontools.hxx>
#include <drawinglayer/primitive3d/transformprimitive3d.hxx>
#include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx>
+#include <rtl/instance.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -34,190 +36,254 @@ namespace drawinglayer
{
namespace // anonymous namespace
{
- Primitive3DSequence getLineTubeSegments(
- sal_uInt32 nSegments,
- const attribute::MaterialAttribute3D& rMaterial)
+ class TubeBuffer : boost::noncopyable
{
- // static data for buffered tube primitives
- static Primitive3DSequence aLineTubeList;
- static sal_uInt32 nLineTubeSegments(0L);
- static attribute::MaterialAttribute3D aLineMaterial;
- static ::osl::Mutex aMutex;
-
- // may exclusively change static data, use mutex
- ::osl::MutexGuard aGuard(aMutex);
-
- if(nSegments != nLineTubeSegments || !(rMaterial == aLineMaterial))
+ private:
+ // data for buffered tube primitives
+ Primitive3DSequence m_aLineTubeList;
+ sal_uInt32 m_nLineTubeSegments;
+ attribute::MaterialAttribute3D m_aLineMaterial;
+ ::osl::Mutex m_aMutex;
+ public:
+ TubeBuffer()
+ : m_nLineTubeSegments(0L)
{
- nLineTubeSegments = nSegments;
- aLineMaterial = rMaterial;
- aLineTubeList = Primitive3DSequence();
}
- if(!aLineTubeList.hasElements() && 0L != nLineTubeSegments)
+ Primitive3DSequence getLineTubeSegments(
+ sal_uInt32 nSegments,
+ const attribute::MaterialAttribute3D& rMaterial)
{
- const basegfx::B3DPoint aLeft(0.0, 0.0, 0.0);
- const basegfx::B3DPoint aRight(1.0, 0.0, 0.0);
- basegfx::B3DPoint aLastLeft(0.0, 1.0, 0.0);
- basegfx::B3DPoint aLastRight(1.0, 1.0, 0.0);
- basegfx::B3DHomMatrix aRot;
- aRot.rotate(F_2PI / (double)nLineTubeSegments, 0.0, 0.0);
- aLineTubeList.realloc(nLineTubeSegments);
-
- for(sal_uInt32 a(0L); a < nLineTubeSegments; a++)
+ // may exclusively change cached data, use mutex
+ ::osl::MutexGuard aGuard(m_aMutex);
+
+ if (nSegments != m_nLineTubeSegments || !(rMaterial == m_aLineMaterial))
{
- const basegfx::B3DPoint aNextLeft(aRot * aLastLeft);
- const basegfx::B3DPoint aNextRight(aRot * aLastRight);
- basegfx::B3DPolygon aNewPolygon;
+ m_nLineTubeSegments = nSegments;
+ m_aLineMaterial = rMaterial;
+ m_aLineTubeList = Primitive3DSequence();
+ }
- aNewPolygon.append(aNextLeft);
- aNewPolygon.setNormal(0L, basegfx::B3DVector(aNextLeft - aLeft));
+ if (!m_aLineTubeList.hasElements() && m_nLineTubeSegments != 0)
+ {
+ const basegfx::B3DPoint aLeft(0.0, 0.0, 0.0);
+ const basegfx::B3DPoint aRight(1.0, 0.0, 0.0);
+ basegfx::B3DPoint aLastLeft(0.0, 1.0, 0.0);
+ basegfx::B3DPoint aLastRight(1.0, 1.0, 0.0);
+ basegfx::B3DHomMatrix aRot;
+ aRot.rotate(F_2PI / (double)m_nLineTubeSegments, 0.0, 0.0);
+ m_aLineTubeList.realloc(m_nLineTubeSegments);
+
+ for(sal_uInt32 a = 0; a < m_nLineTubeSegments; ++a)
+ {
+ const basegfx::B3DPoint aNextLeft(aRot * aLastLeft);
+ const basegfx::B3DPoint aNextRight(aRot * aLastRight);
+ basegfx::B3DPolygon aNewPolygon;
- aNewPolygon.append(aLastLeft);
- aNewPolygon.setNormal(1L, basegfx::B3DVector(aLastLeft - aLeft));
+ aNewPolygon.append(aNextLeft);
+ aNewPolygon.setNormal(0L, basegfx::B3DVector(aNextLeft - aLeft));
- aNewPolygon.append(aLastRight);
- aNewPolygon.setNormal(2L, basegfx::B3DVector(aLastRight - aRight));
+ aNewPolygon.append(aLastLeft);
+ aNewPolygon.setNormal(1L, basegfx::B3DVector(aLastLeft - aLeft));
- aNewPolygon.append(aNextRight);
- aNewPolygon.setNormal(3L, basegfx::B3DVector(aNextRight - aRight));
+ aNewPolygon.append(aLastRight);
+ aNewPolygon.setNormal(2L, basegfx::B3DVector(aLastRight - aRight));
- aNewPolygon.setClosed(true);
+ aNewPolygon.append(aNextRight);
+ aNewPolygon.setNormal(3L, basegfx::B3DVector(aNextRight - aRight));
- const basegfx::B3DPolyPolygon aNewPolyPolygon(aNewPolygon);
- const Primitive3DReference xRef(new PolyPolygonMaterialPrimitive3D(aNewPolyPolygon, aLineMaterial, false));
- aLineTubeList[a] = xRef;
+ aNewPolygon.setClosed(true);
- aLastLeft = aNextLeft;
- aLastRight = aNextRight;
+ const basegfx::B3DPolyPolygon aNewPolyPolygon(aNewPolygon);
+ const Primitive3DReference xRef(new PolyPolygonMaterialPrimitive3D(aNewPolyPolygon, m_aLineMaterial, false));
+ m_aLineTubeList[a] = xRef;
+
+ aLastLeft = aNextLeft;
+ aLastRight = aNextRight;
+ }
}
+ return m_aLineTubeList;
}
+ };
- return aLineTubeList;
- }
+ struct theTubeBuffer :
+ public rtl::Static< TubeBuffer, theTubeBuffer > {};
- Primitive3DSequence getLineCapSegments(
+ Primitive3DSequence getLineTubeSegments(
sal_uInt32 nSegments,
const attribute::MaterialAttribute3D& rMaterial)
{
// static data for buffered tube primitives
- static Primitive3DSequence aLineCapList;
- static sal_uInt32 nLineCapSegments(0L);
- static attribute::MaterialAttribute3D aLineMaterial;
-
- // may exclusively change static data, use mutex
- ::osl::Mutex m_mutex;
+ TubeBuffer &rTheBuffer = theTubeBuffer::get();
+ return rTheBuffer.getLineTubeSegments(nSegments, rMaterial);
+ }
- if(nSegments != nLineCapSegments || !(rMaterial == aLineMaterial))
+ class CapBuffer : boost::noncopyable
+ {
+ private:
+ // data for buffered cap primitives
+ Primitive3DSequence m_aLineCapList;
+ sal_uInt32 m_nLineCapSegments;
+ attribute::MaterialAttribute3D m_aLineMaterial;
+ ::osl::Mutex m_aMutex;
+ public:
+ CapBuffer()
+ : m_nLineCapSegments(0)
{
- nLineCapSegments = nSegments;
- aLineMaterial = rMaterial;
- aLineCapList = Primitive3DSequence();
}
-
- if(!aLineCapList.hasElements() && 0L != nLineCapSegments)
+ Primitive3DSequence getLineCapSegments(
+ sal_uInt32 nSegments,
+ const attribute::MaterialAttribute3D& rMaterial)
{
- const basegfx::B3DPoint aNull(0.0, 0.0, 0.0);
- basegfx::B3DPoint aLast(0.0, 1.0, 0.0);
- basegfx::B3DHomMatrix aRot;
- aRot.rotate(F_2PI / (double)nLineCapSegments, 0.0, 0.0);
- aLineCapList.realloc(nLineCapSegments);
+ // may exclusively change cached data, use mutex
+ ::osl::MutexGuard aGuard(m_aMutex);
+
+ if (nSegments != m_nLineCapSegments || !(rMaterial == m_aLineMaterial))
+ {
+ m_nLineCapSegments = nSegments;
+ m_aLineMaterial = rMaterial;
+ m_aLineCapList = Primitive3DSequence();
+ }
- for(sal_uInt32 a(0L); a < nLineCapSegments; a++)
+ if (!m_aLineCapList.hasElements() && m_nLineCapSegments != 0)
{
- const basegfx::B3DPoint aNext(aRot * aLast);
- basegfx::B3DPolygon aNewPolygon;
+ const basegfx::B3DPoint aNull(0.0, 0.0, 0.0);
+ basegfx::B3DPoint aLast(0.0, 1.0, 0.0);
+ basegfx::B3DHomMatrix aRot;
+ aRot.rotate(F_2PI / (double)m_nLineCapSegments, 0.0, 0.0);
+ m_aLineCapList.realloc(m_nLineCapSegments);
- aNewPolygon.append(aLast);
- aNewPolygon.setNormal(0L, basegfx::B3DVector(aLast - aNull));
+ for(sal_uInt32 a = 0; a < m_nLineCapSegments; ++a)
+ {
+ const basegfx::B3DPoint aNext(aRot * aLast);
+ basegfx::B3DPolygon aNewPolygon;
- aNewPolygon.append(aNext);
- aNewPolygon.setNormal(1L, basegfx::B3DVector(aNext - aNull));
+ aNewPolygon.append(aLast);
+ aNewPolygon.setNormal(0L, basegfx::B3DVector(aLast - aNull));
- aNewPolygon.append(aNull);
- aNewPolygon.setNormal(2L, basegfx::B3DVector(-1.0, 0.0, 0.0));
+ aNewPolygon.append(aNext);
+ aNewPolygon.setNormal(1L, basegfx::B3DVector(aNext - aNull));
- aNewPolygon.setClosed(true);
+ aNewPolygon.append(aNull);
+ aNewPolygon.setNormal(2L, basegfx::B3DVector(-1.0, 0.0, 0.0));
- const basegfx::B3DPolyPolygon aNewPolyPolygon(aNewPolygon);
- const Primitive3DReference xRef(new PolyPolygonMaterialPrimitive3D(aNewPolyPolygon, aLineMaterial, false));
- aLineCapList[a] = xRef;
+ aNewPolygon.setClosed(true);
- aLast = aNext;
+ const basegfx::B3DPolyPolygon aNewPolyPolygon(aNewPolygon);
+ const Primitive3DReference xRef(new PolyPolygonMaterialPrimitive3D(aNewPolyPolygon, m_aLineMaterial, false));
+ m_aLineCapList[a] = xRef;
+
+ aLast = aNext;
+ }
}
+
+ return m_aLineCapList;
}
+ };
- return aLineCapList;
- }
+ struct theCapBuffer :
+ public rtl::Static< CapBuffer, theCapBuffer > {};
- Primitive3DSequence getLineCapRoundSegments(
+ Primitive3DSequence getLineCapSegments(
sal_uInt32 nSegments,
const attribute::MaterialAttribute3D& rMaterial)
{
- // static data for buffered tube primitives
- static Primitive3DSequence aLineCapRoundList;
- static sal_uInt32 nLineCapRoundSegments(0);
- static attribute::MaterialAttribute3D aLineMaterial;
-
- // may exclusively change static data, use mutex
- ::osl::Mutex m_mutex;
+ // static data for buffered cap primitives
+ CapBuffer &rTheBuffer = theCapBuffer::get();
+ return rTheBuffer.getLineCapSegments(nSegments, rMaterial);
+ }
- if(nSegments != nLineCapRoundSegments || !(rMaterial == aLineMaterial))
+ class CapRoundBuffer : boost::noncopyable
+ {
+ private:
+ // data for buffered capround primitives
+ Primitive3DSequence m_aLineCapRoundList;
+ sal_uInt32 m_nLineCapRoundSegments;
+ attribute::MaterialAttribute3D m_aLineMaterial;
+ ::osl::Mutex m_aMutex;
+ public:
+ CapRoundBuffer()
+ : m_nLineCapRoundSegments(0)
{
- nLineCapRoundSegments = nSegments;
- aLineMaterial = rMaterial;
- aLineCapRoundList = Primitive3DSequence();
}
-
- if(!aLineCapRoundList.hasElements() && nLineCapRoundSegments)
+ Primitive3DSequence getLineCapRoundSegments(
+ sal_uInt32 nSegments,
+ const attribute::MaterialAttribute3D& rMaterial)
{
- // calculate new horizontal segments
- sal_uInt32 nVerSeg(nSegments / 2);
+ // may exclusively change cached data, use mutex
+ ::osl::MutexGuard aGuard(m_aMutex);
- if(nVerSeg < 1)
+ if (nSegments != m_nLineCapRoundSegments || !(rMaterial == m_aLineMaterial))
{
- nVerSeg = 1;
+ m_nLineCapRoundSegments = nSegments;
+ m_aLineMaterial = rMaterial;
+ m_aLineCapRoundList = Primitive3DSequence();
}
- // create half-sphere; upper half of unit sphere
- basegfx::B3DPolyPolygon aSphere(
- basegfx::tools::createUnitSphereFillPolyPolygon(
- nSegments,
- nVerSeg,
- true,
- F_PI2, 0.0,
- 0.0, F_2PI));
- const sal_uInt32 nCount(aSphere.count());
-
- if(nCount)
+ if (!m_aLineCapRoundList.hasElements() && m_nLineCapRoundSegments)
{
- // rotate to have sphere cap orientned to negative X-Axis; do not
- // forget to transform normals, too
- basegfx::B3DHomMatrix aSphereTrans;
-
- aSphereTrans.rotate(0.0, 0.0, F_PI2);
- aSphere.transform(aSphereTrans);
- aSphere.transformNormals(aSphereTrans);
+ // calculate new horizontal segments
+ sal_uInt32 nVerSeg(nSegments / 2);
- // realloc for primitives and create based on polygon snippets
- aLineCapRoundList.realloc(nCount);
+ if (nVerSeg < 1)
+ {
+ nVerSeg = 1;
+ }
- for(sal_uInt32 a(0); a < nCount; a++)
+ // create half-sphere; upper half of unit sphere
+ basegfx::B3DPolyPolygon aSphere(
+ basegfx::tools::createUnitSphereFillPolyPolygon(
+ nSegments,
+ nVerSeg,
+ true,
+ F_PI2, 0.0,
+ 0.0, F_2PI));
+ const sal_uInt32 nCount(aSphere.count());
+
+ if (nCount)
{
- const basegfx::B3DPolygon aPartPolygon(aSphere.getB3DPolygon(a));
- const basegfx::B3DPolyPolygon aPartPolyPolygon(aPartPolygon);
-
- // need to create one primitive per Polygon since the primitive
- // is for planar PolyPolygons which is definitely not the case here
- aLineCapRoundList[a] = new PolyPolygonMaterialPrimitive3D(
- aPartPolyPolygon,
- rMaterial,
- false);
+ // rotate to have sphere cap orientned to negative X-Axis; do not
+ // forget to transform normals, too
+ basegfx::B3DHomMatrix aSphereTrans;
+
+ aSphereTrans.rotate(0.0, 0.0, F_PI2);
+ aSphere.transform(aSphereTrans);
+ aSphere.transformNormals(aSphereTrans);
+
+ // realloc for primitives and create based on polygon snippets
+ m_aLineCapRoundList.realloc(nCount);
+
+ for (sal_uInt32 a = 0; a < nCount; ++a)
+ {
+ const basegfx::B3DPolygon aPartPolygon(aSphere.getB3DPolygon(a));
+ const basegfx::B3DPolyPolygon aPartPolyPolygon(aPartPolygon);
+
+ // need to create one primitive per Polygon since the primitive
+ // is for planar PolyPolygons which is definitely not the case here
+ m_aLineCapRoundList[a] = new PolyPolygonMaterialPrimitive3D(
+ aPartPolyPolygon,
+ rMaterial,
+ false);
+ }
}
}
+
+ return m_aLineCapRoundList;
}
- return aLineCapRoundList;
+ };
+
+ struct theCapRoundBuffer :
+ public rtl::Static< CapRoundBuffer, theCapRoundBuffer > {};
+
+
+ Primitive3DSequence getLineCapRoundSegments(
+ sal_uInt32 nSegments,
+ const attribute::MaterialAttribute3D& rMaterial)
+ {
+ // static data for buffered cap primitives
+ CapRoundBuffer &rTheBuffer = theCapRoundBuffer::get();
+ return rTheBuffer.getLineCapRoundSegments(nSegments, rMaterial);
}
Primitive3DSequence getLineJoinSegments(
commit 9daa7d433992f8d0e7ceae158a6af5a0a69e41ea
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed May 1 17:01:24 2013 +0100
rather nutso, just drop the XubString variant
Change-Id: Iebff2bc517e3b6422a6b410f44d78cee1b6d971d
diff --git a/include/vcl/textview.hxx b/include/vcl/textview.hxx
index 314e30f..9873d89 100644
--- a/include/vcl/textview.hxx
+++ b/include/vcl/textview.hxx
@@ -125,9 +125,7 @@ public:
String GetSelected( LineEnd aSeparator );
void DeleteSelected();
- void InsertNewText( const OUString& rNew, sal_Bool bSelect = sal_False );
- // deprecated: use InsertNewText instead
- void InsertText( const String& rNew, sal_Bool bSelect = sal_False );
+ void InsertText( const OUString& rNew, sal_Bool bSelect = sal_False );
sal_Bool KeyInput( const KeyEvent& rKeyEvent );
void Paint( const Rectangle& rRect );
diff --git a/vcl/source/edit/textview.cxx b/vcl/source/edit/textview.cxx
index 05ea5f2..4483616 100644
--- a/vcl/source/edit/textview.cxx
+++ b/vcl/source/edit/textview.cxx
@@ -1181,7 +1181,7 @@ void TextView::Paste( uno::Reference< datatransfer::clipboard::XClipboard >& rxC
bool bWasTruncated = false;
if( mpImpl->mpTextEngine->GetMaxTextLen() != 0 )
bWasTruncated = ImplTruncateNewText( aText );
- InsertNewText( aText, sal_False );
+ InsertText( aText, sal_False );
mpImpl->mpTextEngine->Broadcast( TextHint( TEXT_HINT_MODIFIED ) );
if( bWasTruncated )
@@ -1337,12 +1337,7 @@ TextSelection TextView::ImpMoveCursor( const KeyEvent& rKeyEvent )
return mpImpl->maSelection;
}
-void TextView::InsertText( const XubString& rStr, sal_Bool bSelect )
-{
- InsertNewText( rStr, bSelect );
-}
-
-void TextView::InsertNewText( const OUString& rStr, sal_Bool bSelect )
+void TextView::InsertText( const OUString& rStr, sal_Bool bSelect )
{
// HideSelection();
mpImpl->mpTextEngine->UndoActionStart();
More information about the Libreoffice-commits
mailing list