[Libreoffice-commits] .: dbaccess/source
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
New commits:
commit 48cdc0318b348c51742339b243dc05546148b335
Author: Julien Nabet serval2...@yahoo.fr
Date: Sat Oct 22 11:26:20 2011 +0200
Fix fdo#38286. Perhaps it could be simplified
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 8fc9e70..44c2503 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -3213,7 +3213,18 @@ void OQueryDesignView::fillFunctionInfo( const
::connectivity::OSQLParseNode* p
OQueryController rController =
static_castOQueryController(getController());
sal_Int32 nDataType = DataType::DOUBLE;
::rtl::OUString sFieldName = sFunctionTerm;
-OSQLParseNode* pFunctionName = pNode-getChild(0);
+const OSQLParseNode* pFunctionName;
+// Fix fdo#38286 : crash when constant in the query
+// TODO : is it possible to have a child or children in the pNode ?
+// if not this part could be simplified
+if (pNode-count())
+{
+pFunctionName = pNode-getChild(0);
+}
+else
+{
+pFunctionName = pNode;
+}
if ( !SQL_ISPUNCTUATION(pFunctionName,{) )
{
if ( SQL_ISRULEOR2(pNode,length_exp,char_value_fct) )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: Branch 'feature/gtk3' - vcl/inc vcl/unx
vcl/inc/unx/gtk/gtkgdi.hxx|1
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 35 +++---
2 files changed, 27 insertions(+), 9 deletions(-)
New commits:
commit 426915d4418266817258b837ddb830a1b78fa151
Author: Lucas Baudin xapa...@gmail.com
Date: Fri Oct 21 22:21:39 2011 +0200
gtk3: Use CheckBox style (there is still a problem with the hover stage)
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 589a109..6ca6c47 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -71,6 +71,7 @@ private:
GtkStyleContext *mpScrollbarStyle;
GtkStyleContext *mpToolbarStyle;
GtkStyleContext *mpToolButtonStyle;
+GtkStyleContext *mpCheckButtonStyle;
void renderAreaToPix( cairo_t* cr, cairo_rectangle_t* rect );
void drawStyleContext( GtkStyleContext* style, GtkStateFlags flags,
const Rectangle rControlRegion, bool render_background = true );
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 6058924..b021036 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -96,19 +96,28 @@ void GtkSalGraphics::drawStyleContext( GtkStyleContext*
style, GtkStateFlags fla
gtk_style_context_set_state(style, flags);
-gtk_render_background(style, cr,
-1, 1,
-rControlRegion.GetWidth(), rControlRegion.GetHeight());
-gtk_render_frame(style, cr,
-1, 1,
-rControlRegion.GetWidth(), rControlRegion.GetHeight());
+if(!(style == mpCheckButtonStyle))
+{
+gtk_render_background(style, cr,
+1, 1,
+rControlRegion.GetWidth(), rControlRegion.GetHeight());
+gtk_render_frame(style, cr,
+1, 1,
+rControlRegion.GetWidth(), rControlRegion.GetHeight());
+}
+else
+{
+gtk_render_check(style, cr,
+1, 1,
+rControlRegion.GetWidth(), rControlRegion.GetHeight());
+}
renderAreaToPix(cr, rect);
cairo_destroy(cr);
}
sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart
nPart, const Rectangle rControlRegion,
-ControlState nState, const
ImplControlValue,
+ControlState nState, const
ImplControlValue aValue,
const rtl::OUString )
{
GtkStateFlags flags;
@@ -131,6 +140,10 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart
return sal_True;
}
break;
+case CTRL_CHECKBOX:
+flags = (GtkStateFlags)(flags | ( (aValue.getTristateVal() ==
BUTTONVALUE_ON) ? GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL));
+drawStyleContext(mpCheckButtonStyle, flags, rControlRegion);
+return sal_True;
case CTRL_PUSHBUTTON:
drawStyleContext(mpButtonStyle, flags, rControlRegion);
return sal_True;
@@ -502,7 +515,10 @@ void GtkSalGraphics::updateSettings( AllSettings
rSettings )
sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType,
ControlPart nPart )
{
-if((nType == CTRL_PUSHBUTTON nPart == PART_ENTIRE_CONTROL) || nType ==
CTRL_SCROLLBAR || nType == CTRL_EDITBOX /*||
+if( (nType == CTRL_PUSHBUTTON nPart == PART_ENTIRE_CONTROL)
+ || (nType == CTRL_CHECKBOX nPart == PART_ENTIRE_CONTROL)
+ || nType == CTRL_SCROLLBAR
+ || nType == CTRL_EDITBOX /*||
segfault with recent code, needs investigating nType ==
CTRL_TOOLBAR*/ )
return sal_True;
return sal_False;
@@ -538,6 +554,8 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame,
GtkWidget *pWindow )
getStyleContext(mpToolButtonStyle, GTK_WIDGET(toolbutton));
gtk_style_context_add_class(mpToolButtonStyle, button); /* TODO */
getStyleContext(mpScrollbarStyle, gtk_vscrollbar_new(NULL));
+getStyleContext(mpCheckButtonStyle, gtk_check_button_new());
+gtk_style_context_add_class(mpCheckButtonStyle, check);
}
@@ -567,7 +585,6 @@ void GtkSalGraphics::copyArea( long nDestX, long nDestY,
long nSrcWidth, long nSrcHeight,
sal_uInt16 nFlags )
{
-return;
mpFrame-pushIgnoreDamage();
SvpSalGraphics::copyArea( nDestX, nDestY, nSrcX, nSrcY, nSrcWidth,
nSrcHeight, nFlags );
mpFrame-popIgnoreDamage();
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: solenv/gbuild
solenv/gbuild/LinkTarget.mk |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 237c5f0290169aa31e10990c05b7ea39d9fc70bd Author: Bjoern Michaelsen bjoern.michael...@canonical.com Date: Sat Oct 22 12:36:07 2011 +0200 another fix for 68dd19a368fb4afbf3eba4cb722f56b87f8ea7c1 on OSX diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index fc58e4d..3e71c97 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -251,7 +251,7 @@ gb_ObjCxxObject_get_source = $(1)/$(2).mm # defined by platform # gb_ObjCxxObject__command -$(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(1),%) +$(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(SRCDIR),%) $(call gb_ObjCxxObject__command,$@,$*,$,$(call gb_ObjCxxObject_get_dep_target,$*)) ifeq ($(gb_FULLDEPS),$(true)) ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] Changes to 'feature/gbuild'
New branch 'feature/gbuild' available with the following commits: commit 00eb1f5c6f0bb2f648fab5f18368b045f94bb2ca Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Aug 23 15:03:09 2011 +0200 convert cppuhelper to gbuild missing subsequent test commit a10845d2ab4cafdff79e3f791012702ac96d1d84 Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Aug 23 14:47:42 2011 +0200 add visibility symbols for cppuhelper as first step for gbuild commit 8c2751462fede80730f4cfa73b110cda3bc1658c Author: Matúš Kukan matus.ku...@gmail.com Date: Tue Aug 30 14:38:46 2011 +0200 add more unit tests for sal commit 77b38ca3e9db6a744cda89b92ae6ba805ba4756b Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Sep 26 19:25:20 2011 +0200 visibility for sal commit 3a9e8ca1d5b8c78dc5fe2fa8850a9ae10aec50ef Author: Matúš Kukan matus.ku...@gmail.com Date: Mon Aug 1 21:16:39 2011 +0200 convert sal to gbuild commit 515bf6fefd1aef9a8ed5d65d8986e9e0166a4b70 Author: Matúš Kukan matus.ku...@gmail.com Date: Wed Sep 28 16:45:24 2011 +0200 convert cppu to gbuild, missing unit tests commit e2f30c078fcf26d481c2e90398b450f6c475a483 Author: Matúš Kukan matus.ku...@gmail.com Date: Thu Jul 28 19:11:15 2011 +0200 convert salhelper to gbuild ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc
binfilter/bf_svx/source/editeng/impedit.hxx | 80 ---
binfilter/bf_svx/source/editeng/svx_impedit2.cxx | 59 +---
binfilter/bf_svx/source/editeng/svx_impedit3.cxx | 45
binfilter/inc/bf_svx/editdata.hxx|6 -
4 files changed, 7 insertions(+), 183 deletions(-)
New commits:
commit a8230c23ef7021d153a5281e3e071934a8b5042d
Author: Joseph Powers jpower...@cox.net
Date: Sat Oct 22 05:05:59 2011 -0700
Cleanup class ImpEditEngine a little
diff --git a/binfilter/bf_svx/source/editeng/impedit.hxx
b/binfilter/bf_svx/source/editeng/impedit.hxx
index 16525d0..01685b5 100644
--- a/binfilter/bf_svx/source/editeng/impedit.hxx
+++ b/binfilter/bf_svx/source/editeng/impedit.hxx
@@ -101,17 +101,6 @@ namespace clipboard {
namespace binfilter {
-struct ImplIMEInfos
-{
-String aOldTextAfterStartPos;
-sal_uInt16* pAttribs;
-EditPaM aPos;
-sal_uInt16 nLen;
-sal_BoolbCursor;
-sal_BoolbWasCursorOverwrite;
-};
-
-
struct FormatterFontMetric
{
sal_uInt16 nMaxAscent;
@@ -138,40 +127,16 @@ private:
Window* pOutWin;
Pointer*pPointer;
-longnInvMore;
ULONG nControl;
-sal_uInt32 nTravelXPos;
-sal_uInt16 nExtraCursorFlags;
-sal_uInt16 nCursorBidiLevel;
-sal_uInt16 nScrollDiffX;
sal_BoolbReadOnly;
-sal_BoolbClickedInSelection;
-sal_BoolbActiveDragAndDropListener;
-Point aAnchorPoint;
Rectangle aOutArea;
Point aVisDocStartPos;
-EESelectionMode eSelectionMode;
EditSelection aEditSelection;
-EVAnchorModeeAnchorMode;
-
-protected:
-
-// DragAndDropClient
-
-
public:
~ImpEditView();
-EditView* GetEditViewPtr() { return pEditView; }
-
-sal_uInt16 GetScrollDiffX() const { return nScrollDiffX; }
-voidSetScrollDiffX( sal_uInt16 n ) { nScrollDiffX = n; }
-
-sal_uInt16 GetCursorBidiLevel() const { return nCursorBidiLevel;
}
-voidSetCursorBidiLevel( sal_uInt16 n ) { nCursorBidiLevel = n;
}
-
Point GetDocPos( const Point rWindowPos ) const;
Point GetWindowPos( const Point rDocPos ) const;
Rectangle GetWindowPos( const Rectangle rDocPos ) const;
@@ -180,9 +145,6 @@ public:
BOOLIsVertical() const;
-voidSetVisDocStartPos( const Point rPos ) { aVisDocStartPos =
rPos; }
-const PointGetVisDocStartPos() const { return aVisDocStartPos; }
-
longGetVisDocLeft() const { return aVisDocStartPos.X(); }
longGetVisDocTop() const { return aVisDocStartPos.Y(); }
longGetVisDocRight() const { return aVisDocStartPos.X() + (
!IsVertical() ? aOutArea.GetWidth() : aOutArea.GetHeight() ); }
@@ -198,36 +160,19 @@ public:
Window* GetWindow() const { return pOutWin; }
-EESelectionMode GetSelectionMode() const{ return eSelectionMode; }
-
inline void SetPointer( const Pointer rPointer );
-inline const Pointer GetPointer();
+inline constPointer GetPointer();
inline void SetCursor( const Cursor rCursor );
inline Cursor* GetCursor();
-
-EVAnchorModeGetAnchorMode() const { return eAnchorMode; }
voidShowCursor( sal_Bool bGotoCursor, sal_Bool
bForceVisCursor, BOOL test );
-sal_BoolIsInsertMode() const{ return ( ( nControl
EV_CNTRL_OVERWRITE ) == 0 ); }
-
-voidEnablePaste( sal_Bool bEnable ) { SetFlags(
nControl, EV_CNTRL_ENABLEPASTE, bEnable ); }
-sal_BoolIsPasteEnabled() const { return ( ( nControl
EV_CNTRL_ENABLEPASTE ) != 0 ); }
-
-sal_BoolDoSingleLinePaste() const { return ( ( nControl
EV_CNTRL_SINGLELINEPASTE ) != 0 ); }
-sal_BoolDoAutoScroll() const{ return ( ( nControl
EV_CNTRL_AUTOSCROLL ) != 0 ); }
-sal_BoolDoBigScroll() const { return ( ( nControl
EV_CNTRL_BIGSCROLL ) != 0 ); }
-sal_BoolDoAutoSize() const { return ( ( nControl
EV_CNTRL_AUTOSIZE ) != 0 ); }
-sal_BoolDoAutoWidth() const { return ( ( nControl
EV_CNTRL_AUTOSIZEX) != 0 ); }
-sal_BoolDoInvalidateMore() const{ return ( ( nControl
EV_CNTRL_INVONEMORE ) != 0 ); }
+sal_BoolIsInsertMode() const { return ( ( nControl
EV_CNTRL_OVERWRITE ) == 0 ); }
+sal_BoolDoAutoScroll() const { return ( ( nControl
EV_CNTRL_AUTOSCROLL ) != 0 ); }
const ColorGetBackgroundColor() const {
return ( pBackgroundColor ? *pBackgroundColor :
pOutWin-GetBackground().GetColor() ); }
-
-
[Libreoffice-commits] .: Branch 'feature/gtk3' - vcl/unx
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx | 49 ++
1 file changed, 43 insertions(+), 6 deletions(-)
New commits:
commit 7f121e108c6d66c6bdf6fc321c29872d2d416e72
Author: Lucas Baudin xapa...@gmail.com
Date: Sat Oct 22 17:45:27 2011 +0200
gtk3: add toolbar rendering, there is some graphical bugs if you have more
than one row in the toolbar (is it detectable in GtkSalGraphices?)
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index b021036..a5877dd 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -92,7 +92,27 @@ void GtkSalGraphics::drawStyleContext( GtkStyleContext*
style, GtkStateFlags fla
rect.width = rControlRegion.GetWidth() + 2;
if(render_background)
-gtk_render_background(gtk_widget_get_style_context(mpWindow), cr, 0,
0, rControlRegion.GetWidth() + 2, rControlRegion.GetHeight() + 2);
+gtk_render_background(gtk_widget_get_style_context(mpWindow),
+cr,
+0, 0,
+rControlRegion.GetWidth() + 2, rControlRegion.GetHeight() + 2);
+
+else if(style == mpToolButtonStyle)
+{
+/* For toolbuttons, we need to re-draw the toolbar. We also need to
re-draw
+ * the window background which is under the toolbar.
+ *
+ * FIXME: the width and height of the toolbar are hardcoded, it would
be better
+ * if we could get the size, and the coords of the parent before
re-drawing.
+ */
+gtk_render_background(gtk_widget_get_style_context(mpWindow),
+cr,
+-2, -2,
+rControlRegion.GetWidth() + 6, rControlRegion.GetHeight() + 6);
+gtk_render_background(mpToolbarStyle, cr,
+-4, -4,
+rControlRegion.GetWidth() + 8, rControlRegion.GetHeight() + 8);
+}
gtk_style_context_set_state(style, flags);
@@ -136,7 +156,10 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType
nType, ControlPart nPart
drawStyleContext(mpToolbarStyle, flags, rControlRegion);
return sal_True;
case PART_BUTTON:
-drawStyleContext(mpToolButtonStyle, flags, rControlRegion);
+/* For all checkbuttons in the toolbars */
+flags = (GtkStateFlags)(flags |
+( (aValue.getTristateVal() == BUTTONVALUE_ON) ?
GTK_STATE_FLAG_ACTIVE : GTK_STATE_FLAG_NORMAL));
+drawStyleContext(mpToolButtonStyle, flags, rControlRegion, false);
return sal_True;
}
break;
@@ -518,7 +541,9 @@ sal_Bool GtkSalGraphics::IsNativeControlSupported(
ControlType nType, ControlPar
if( (nType == CTRL_PUSHBUTTON nPart == PART_ENTIRE_CONTROL)
|| (nType == CTRL_CHECKBOX nPart == PART_ENTIRE_CONTROL)
|| nType == CTRL_SCROLLBAR
- || nType == CTRL_EDITBOX /*||
+ || nType == CTRL_EDITBOX
+ || (nType == CTRL_TOOLBAR nPart == PART_ENTIRE_CONTROL)
+ || (nType == CTRL_TOOLBAR nPart == PART_BUTTON)/*||
segfault with recent code, needs investigating nType ==
CTRL_TOOLBAR*/ )
return sal_True;
return sal_False;
@@ -531,7 +556,7 @@ void GtkSalGraphics::getStyleContext(GtkStyleContext**
style, GtkWidget* widget)
{
*style = gtk_widget_get_style_context(widget);
g_object_ref(*style);
-gtk_widget_destroy(widget);
+//gtk_widget_destroy(widget);
}
GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow )
@@ -546,13 +571,25 @@ GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame,
GtkWidget *pWindow )
* too slow */
GtkWidget* toolbar = gtk_toolbar_new();
GtkWidget* toolbutton = gtk_button_new();
-//gtk_container_add(GTK_CONTAINER(toolbar), GTK_WIDGET(toolbutton));
getStyleContext(mpEntryStyle, gtk_entry_new());
getStyleContext(mpButtonStyle, gtk_button_new());
getStyleContext(mpToolbarStyle, toolbar);
+
gtk_style_context_add_class(mpToolbarStyle, primary-toolbar);
+gtk_style_context_add_class(mpToolbarStyle, toolbar);
getStyleContext(mpToolButtonStyle, GTK_WIDGET(toolbutton));
-gtk_style_context_add_class(mpToolButtonStyle, button); /* TODO */
+
+/* Create a widget path for our toolbutton widget */
+GtkWidgetPath* path = gtk_widget_path_new ();
+gtk_widget_path_append_type(path, GTK_TYPE_TOOLBAR);
+gtk_widget_path_append_type(path, GTK_TYPE_TOOL_BUTTON);
+gtk_widget_path_append_type(path, GTK_TYPE_BUTTON);
+
+gtk_widget_path_iter_add_class (path, 0, primary-toolbar);
+gtk_widget_path_iter_add_class (path, 0, toolbar);
+gtk_widget_path_iter_add_class (path, 2, button);
+gtk_style_context_set_path(mpToolButtonStyle, path);
+
getStyleContext(mpScrollbarStyle, gtk_vscrollbar_new(NULL));
getStyleContext(mpCheckButtonStyle, gtk_check_button_new());
[Libreoffice-commits] .: 3 commits - libvisio/libvisio-0.0.8-build.patch libvisio/libvisio-0.0.8-draw_stroke.patch libvisio/libvisio-0.0.8.patch libvisio/libvisio-0.0.9.patch libvisio/libvisio-0.0.9-v
libvisio/libvisio-0.0.8-build.patch | 18 --
libvisio/libvisio-0.0.8-draw_stroke.patch | 11 -
libvisio/libvisio-0.0.8.patch | 33 -
libvisio/libvisio-0.0.9-valgrind.patch| 190 ++
libvisio/libvisio-0.0.9.patch | 20 +++
libvisio/makefile.mk |9 -
ooo.lst.in|2
7 files changed, 215 insertions(+), 68 deletions(-)
New commits:
commit 4dedf9d43d83f6f142ca060eb4edb93e3e5bda84
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Sun Oct 23 03:24:35 2011 +0200
Dump unnecessary patch hunk
diff --git a/libvisio/libvisio-0.0.9.patch b/libvisio/libvisio-0.0.9.patch
index 24a8d65..f7e6df2 100644
--- a/libvisio/libvisio-0.0.9.patch
+++ b/libvisio/libvisio-0.0.9.patch
@@ -18,16 +18,3 @@
#endif
misc/libvisio-0.0.9/src/lib/makefile.mk
-+++ misc/build/libvisio-0.0.9/src/lib/makefile.mk
-@@ -37,9 +37,9 @@
- $(SLO)$/VSDSVGGenerator.obj \
- $(SLO)$/VSDXCharacterList.obj \
- $(SLO)$/VSDXCollector.obj \
-+ $(SLO)$/VSDXOutputElementList.obj \
- $(SLO)$/VSDXContentCollector.obj \
- $(SLO)$/VSDXGeometryList.obj \
-- $(SLO)$/VSDXOutputElementList.obj \
- $(SLO)$/VSDXPages.obj \
- $(SLO)$/VSDXParser.obj \
- $(SLO)$/VSDXShapeList.obj \
commit 7420da1e95f394d4f0e97ddf14a8886da991bfe0
Author: Fridrich Å trba fridrich.st...@bluewin.ch
Date: Sun Oct 23 03:21:35 2011 +0200
Fix valgrind errors
diff --git a/libvisio/libvisio-0.0.9-valgrind.patch
b/libvisio/libvisio-0.0.9-valgrind.patch
new file mode 100644
index 000..39442a9
--- /dev/null
+++ b/libvisio/libvisio-0.0.9-valgrind.patch
@@ -0,0 +1,190 @@
+--- misc/libvisio-0.0.9/src/lib/VSDXStyles.cpp 2011-10-22 15:25:55.0
+0200
misc/build/libvisio-0.0.9/src/lib/VSDXStyles.cpp 2011-10-23
03:18:45.209282989 +0200
+@@ -37,8 +37,151 @@
+ {
+ }
+
++libvisio::VSDXStyles::VSDXStyles(const libvisio::VSDXStyles styles) :
++ m_lineStyles(), m_fillStyles(), m_textBlockStyles(), m_charStyles(),
m_paraStyles(),
++ m_lineStyleMasters(styles.m_lineStyleMasters),
m_fillStyleMasters(styles.m_fillStyleMasters),
++ m_textStyleMasters(styles.m_textStyleMasters)
++{
++ for (std::mapunsigned, VSDXFillStyle *::const_iterator iterFillStyle =
styles.m_fillStyles.begin();
++ iterFillStyle != styles.m_fillStyles.end(); iterFillStyle++)
++ {
++if (iterFillStyle-second)
++ m_fillStyles[iterFillStyle-first] = new
VSDXFillStyle(*(iterFillStyle-second));
++ }
++ for (std::mapunsigned, VSDXLineStyle *::const_iterator iterLineStyle =
styles.m_lineStyles.begin();
++ iterLineStyle != styles.m_lineStyles.end(); iterLineStyle++)
++ {
++if (iterLineStyle-second)
++ m_lineStyles[iterLineStyle-first] = new
VSDXLineStyle(*(iterLineStyle-second));
++ }
++ for (std::mapunsigned, VSDXTextBlockStyle *::const_iterator
iterTextBlockStyle = styles.m_textBlockStyles.begin();
++ iterTextBlockStyle != styles.m_textBlockStyles.end();
iterTextBlockStyle++)
++ {
++if (iterTextBlockStyle-second)
++ m_textBlockStyles[iterTextBlockStyle-first] = new
VSDXTextBlockStyle(*(iterTextBlockStyle-second));
++ }
++ for (std::mapunsigned, VSDXCharStyle *::const_iterator iterCharStyle =
styles.m_charStyles.begin();
++ iterCharStyle != styles.m_charStyles.end(); iterCharStyle++)
++ {
++if (iterCharStyle-second)
++ m_charStyles[iterCharStyle-first] = new
VSDXCharStyle(*(iterCharStyle-second));
++ }
++ for (std::mapunsigned, VSDXParaStyle *::const_iterator iterParaStyle =
styles.m_paraStyles.begin();
++ iterParaStyle != styles.m_paraStyles.end(); iterParaStyle++)
++ {
++if (iterParaStyle-second)
++ m_paraStyles[iterParaStyle-first] = new
VSDXParaStyle(*(iterParaStyle-second));
++ }
++}
++
+ libvisio::VSDXStyles::~VSDXStyles()
+ {
++ for (std::mapunsigned, VSDXFillStyle *::iterator iterFillStyle =
m_fillStyles.begin();
++ iterFillStyle != m_fillStyles.end(); iterFillStyle++)
++ {
++if (iterFillStyle-second)
++ delete iterFillStyle-second;
++ }
++ for (std::mapunsigned, VSDXLineStyle *::iterator iterLineStyle =
m_lineStyles.begin();
++ iterLineStyle != m_lineStyles.end(); iterLineStyle++)
++ {
++if (iterLineStyle-second)
++ delete iterLineStyle-second;
++ }
++ for (std::mapunsigned, VSDXTextBlockStyle *::iterator iterTextBlockStyle
= m_textBlockStyles.begin();
++ iterTextBlockStyle != m_textBlockStyles.end(); iterTextBlockStyle++)
++ {
++if (iterTextBlockStyle-second)
++ delete (iterTextBlockStyle-second);
++ }
++ for (std::mapunsigned, VSDXCharStyle *::iterator iterCharStyle =
m_charStyles.begin();
++ iterCharStyle != m_charStyles.end(); iterCharStyle++)
++ {
++if (iterCharStyle-second)
++ delete (iterCharStyle-second);
++ }
++ for (std::mapunsigned, VSDXParaStyle *::iterator iterParaStyle =
m_paraStyles.begin();
++ iterParaStyle
