oox/source/vml/vmldrawing.cxx | 3 ++-
sc/source/ui/drawfunc/fupoor.cxx | 39 +--------------------------------------
2 files changed, 3 insertions(+), 39 deletions(-)
New commits:
commit d48faab3d6a339f0c2ccba3aeb85d32dd45636f3
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Feb 22 04:29:56 2013 +0100
some clean-up in the comments
Change-Id: I373d315ccfd5580efd5d4b860280ed29fc77b4e3
diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx
index 46134e3..f6d3cd1 100644
--- a/sc/source/ui/drawfunc/fupoor.cxx
+++ b/sc/source/ui/drawfunc/fupoor.cxx
@@ -31,12 +31,6 @@
#include <vcl/svapp.hxx>
#include <svx/sdrhittesthelper.hxx>
-/*************************************************************************
-|*
-|* Konstruktor
-|*
-\************************************************************************/
-
FuPoor::FuPoor(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP,
SdrModel* pDoc, SfxRequest& rReq) :
pView(pViewP),
@@ -56,27 +50,14 @@ FuPoor::FuPoor(ScTabViewShell* pViewSh, Window* pWin,
ScDrawView* pViewP,
aDragTimer.SetTimeout(SELENG_DRAGDROP_TIMEOUT);
}
-/*************************************************************************
-|*
-|* Destruktor
-|*
-\************************************************************************/
-
FuPoor::~FuPoor()
{
aDragTimer.Stop();
aScrollTimer.Stop();
- if (pDialog)
- delete pDialog;
+ delete pDialog;
}
-/*************************************************************************
-|*
-|* Function aktivieren
-|*
-\************************************************************************/
-
void FuPoor::Activate()
{
if (pDialog)
@@ -85,12 +66,6 @@ void FuPoor::Activate()
}
}
-/*************************************************************************
-|*
-|* Function deaktivieren
-|*
-\************************************************************************/
-
void FuPoor::Deactivate()
{
aDragTimer.Stop();
@@ -226,12 +201,6 @@ sal_uInt8 FuPoor::Command(const CommandEvent& rCEvt)
return pView->Command(rCEvt,pWindow);
}
-/*************************************************************************
-|*
-|* Cut object to clipboard
-|*
-\************************************************************************/
-
void FuPoor::DoCut()
{
if (pView)
@@ -254,12 +223,6 @@ void FuPoor::DoCopy()
}
}
-/*************************************************************************
-|*
-|* Paste object from clipboard
-|*
-\************************************************************************/
-
void FuPoor::DoPaste()
{
if (pView)
commit a51f2248a6fe377a9306f4ed5c7db6ca26d0244c
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Fri Feb 22 04:28:42 2013 +0100
fix problem with \0 in string literal
Change-Id: If605c111a1d921e404c4aca12d28c558a6659987
diff --git a/oox/source/vml/vmldrawing.cxx b/oox/source/vml/vmldrawing.cxx
index 5293e1e..88282dd 100644
--- a/oox/source/vml/vmldrawing.cxx
+++ b/oox/source/vml/vmldrawing.cxx
@@ -56,7 +56,8 @@ namespace {
OUString lclGetShapeId( sal_Int32 nShapeId )
{
// identifier consists of a literal NUL character, a lowercase 's', and
the id
- return OUString( "\0s" ) + OUString::valueOf( nShapeId );
+ sal_Unicode aStr[2] = { '\0', 's' };
+ return OUString( aStr, 2 ) + OUString::valueOf( nShapeId );
}
/** Returns the numeric VML shape identifier from its textual representation.
*/
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
