summaryrefslogtreecommitdiff
path: root/sc/source/ui/drawfunc
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-25 19:58:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-03-03 11:04:44 -0600
commit84862db95a5e22b9ef89baa2a8a5deeffefbdef6 (patch)
tree2682cf093a4a5d513bdedaee8298525c9b57ef6f /sc/source/ui/drawfunc
parent7801c94bffdabe669601d23e86f2f2a41447902d (diff)
Remove visual noise from sc
Conflicts: sc/source/ui/inc/docfunc.hxx Change-Id: I9314437ed3dd60e84d28c08ac0a2d1ed7bd1daf8 Reviewed-on: https://gerrit.libreoffice.org/8301 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/drawfunc')
-rw-r--r--sc/source/ui/drawfunc/drawsh.cxx4
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx4
-rw-r--r--sc/source/ui/drawfunc/drawsh5.cxx6
-rw-r--r--sc/source/ui/drawfunc/drformsh.src22
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx16
-rw-r--r--sc/source/ui/drawfunc/fusel.cxx16
-rw-r--r--sc/source/ui/drawfunc/fusel2.cxx2
-rw-r--r--sc/source/ui/drawfunc/objdraw.src118
8 files changed, 94 insertions, 94 deletions
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index cc27e2e81713..30e1e7630ec4 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -179,9 +179,9 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq )
break;
}
- //=====
+
return;
- //=====
+
}
if( pView->AreObjectsMarked() )
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index fa2126e5bbcc..1d39426d5025 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -282,9 +282,9 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl
svx::FontworkBar::getState( pView, rSet );
}
-//
+
// Attribute fuer Drawing-Objekte
-//
+
void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet )
{
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index 4193e80977aa..4370c18e826a 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -244,9 +244,9 @@ sal_uInt16 ScGetFontWorkId();
-//
+
// Funktionen auf Drawing-Objekten
-//
+
void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
{
@@ -258,7 +258,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq )
//!!!
// wer weiss, wie lange das funktioniert? (->vom Abreisscontrol funktioniert es)
- //
+
if (nSlotId == SID_OBJECT_ALIGN && pArgs)
nSlotId = SID_OBJECT_ALIGN + ((SfxEnumItem&)pArgs->Get(SID_OBJECT_ALIGN)).GetValue() + 1;
diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src
index 6d720833445a..0709803f63f5 100644
--- a/sc/source/ui/drawfunc/drformsh.src
+++ b/sc/source/ui/drawfunc/drformsh.src
@@ -20,9 +20,9 @@
#include "sc.hrc"
#include "submenu.hrc"
#include <svx/globlmn.hrc>
- //
+
// Defines -------------------------------------------------------------------------------
- //
+
#define MN_LAYER\
ToolBoxItem\
{\
@@ -167,14 +167,14 @@
// Popup-Menues ---------------------------------------------------------------------
- //
+
String RID_POPUP_DRAWFORM
{
Text [ en-US ] = "Popup menu for form objects";
};
- //
+
// Popup-Menue fuer (Uno-) Controls
- //
+
Menu RID_POPUP_DRAWFORM
{
ItemList =
@@ -187,21 +187,21 @@ Menu RID_POPUP_DRAWFORM
MN_RENAME_OBJECT
//-#i68101#----------------------
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MenuItem { ITEM_FORM_CONTROL_PROPERTIES };
MenuItem { ITEM_FORM_PROPERTIES };
MenuItem { ITEM_REPLACE_CONTROL };
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MN_ARRANGESUB
MN_ALIGNSUB
MN_ANCHORSUB
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
ITEM_GROUP_MENU
};
};
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 7492bf84390e..db575fc90a27 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -141,11 +141,11 @@ ScDrawTextObjectBar::~ScDrawTextObjectBar()
}
}
-//========================================================================
-//
+
+
// Funktionen
-//
-//========================================================================
+
+
void ScDrawTextObjectBar::Execute( SfxRequest &rReq )
{
@@ -544,11 +544,11 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
}
}
-//========================================================================
-//
+
+
// Attribute
-//
-//========================================================================
+
+
void ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq )
{
diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx
index 57f16e9b1570..b8b5e66457fb 100644
--- a/sc/source/ui/drawfunc/fusel.cxx
+++ b/sc/source/ui/drawfunc/fusel.cxx
@@ -278,9 +278,9 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
// try to select the clicked object
if ( pView->MarkObj( aMDPos, -2, false, rMEvt.IsMod1() ) )
{
- //*********************************************************
+
//Objekt verschieben
- //********************************************************
+
if (pView->IsMarkedHit(aMDPos))
{
// Don't start drag timer if inplace editing of an OLE object
@@ -304,9 +304,9 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
if (pViewShell->IsDrawSelMode())
{
- //*********************************************************
+
//Objekt selektieren
- //********************************************************
+
pView->BegMarkObj(aMDPos);
bReturn = true;
}
@@ -523,9 +523,9 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
{
sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
- //
+
// OLE: aktivieren
- //
+
if (nSdrObjKind == OBJ_OLE2)
{
@@ -538,11 +538,11 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
}
}
- //
+
// Edit text
// not in UNO controls
// #i32352# not in media objects
- //
+
else if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) && !pObj->ISA(SdrMediaObj) )
{
OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject();
diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx
index b8de82e13cd2..d19236b9991f 100644
--- a/sc/source/ui/drawfunc/fusel2.cxx
+++ b/sc/source/ui/drawfunc/fusel2.cxx
@@ -163,7 +163,7 @@ void FuSelection::ActivateNoteHandles(SdrObject* pObject)
}
}
-//==================================================================
+
diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src
index 1c6be53daa81..8ae856d4cb3a 100644
--- a/sc/source/ui/drawfunc/objdraw.src
+++ b/sc/source/ui/drawfunc/objdraw.src
@@ -20,9 +20,9 @@
#include "sc.hrc"
#include "submenu.hrc"
#include <svx/globlmn.hrc>
- //
+
// Defines -------------------------------------------------------------------------------
- //
+
#define MN_RESET\
MenuItem\
{\
@@ -364,40 +364,40 @@
};\
};
- //
- // ------------------------------------------------------------------------------
- //
- //
+
+
+
+
// Objekt-Leisten
- //
+
String RID_DRAW_OBJECTBAR
{
Text [ en-US ] = "Drawing Object Bar" ;
};
- //
+
// Text-Toolbox
- //
+
String RID_TEXT_TOOLBOX
{
Text [ en-US ] = "Text Object Bar" ;
};
- //
+
// Graphics toolbox
- //
+
String RID_GRAPHIC_OBJECTBAR
{
Text [ en-US ] = "Image Object Bar";
};
- //
+
// Popup-Menues ---------------------------------------------------------------------
- //
+
String RID_POPUP_DRAW
{
Text [ en-US ] = "Pop-up menu for drawing objects" ;
};
- //
+
// Pop-up menu for drawing objects
- //
+
Menu RID_POPUP_DRAW
{
ItemList =
@@ -413,17 +413,17 @@ Menu RID_POPUP_DRAW
MN_RENAME_OBJECT
//-#i68101#----------------------
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MN_MIRRORSUB
MN_ARRANGESUB
MN_ALIGNSUB
MN_ANCHORSUB
MN_ASSIGNMACRO
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MenuItem
{
ITEM_FORMAT_BEZIER_EDIT
@@ -434,22 +434,22 @@ Menu RID_POPUP_DRAW
{
ITEM_FORMAT_FONTWORK
};
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
ITEM_GROUP_MENU
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MN_EDITLNK
MN_DELLNK
MenuItem { ITEM_OPEN_HYPERLINK };
};
};
- //
+
// Popup-Menue fuer (Uno-) Controls
- //
+
Menu RID_POPUP_CONTROL
{
@@ -463,27 +463,27 @@ Menu RID_POPUP_CONTROL
MN_RENAME_OBJECT
//-#i68101#----------------------
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MenuItem { ITEM_FORM_CONTROL_PROPERTIES };
MenuItem { ITEM_FORM_PROPERTIES };
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MN_ARRANGESUB
MN_ALIGNSUB
MN_ANCHORSUB
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
ITEM_GROUP_MENU
};
};
- //
+
// Grafik
- //
+
Menu RID_POPUP_GRAPHIC
{
@@ -501,21 +501,21 @@ Menu RID_POPUP_GRAPHIC
MN_RENAME_OBJECT
//-#i68101#----------------------
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MN_MIRRORSUB
MN_ARRANGESUB
MN_ALIGNSUB
MN_ANCHORSUB
MN_ASSIGNMACRO
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
ITEM_GROUP_MENU
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MN_EDITLNK
MN_DELLNK
MenuItem { ITEM_OPEN_HYPERLINK };
@@ -524,9 +524,9 @@ Menu RID_POPUP_GRAPHIC
};
};
- //
+
// Media
- //
+
Menu RID_POPUP_MEDIA
{
@@ -540,23 +540,23 @@ Menu RID_POPUP_MEDIA
MN_RENAME_OBJECT
//-#i68101#----------------------
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MN_MIRRORSUB
MN_ARRANGESUB
MN_ALIGNSUB
MN_ANCHORSUB
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
ITEM_GROUP_MENU
};
};
- //
+
// Ole-Objekt
- //
+
Menu RID_POPUP_OLE
{
@@ -577,22 +577,22 @@ Menu RID_POPUP_OLE
MN_RENAME_OBJECT
//-#i68101#----------------------
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MN_ARRANGESUB
MN_ALIGNSUB
MN_ANCHORSUB
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
ITEM_GROUP_MENU
};
};
- //
+
// Charts
- //
+
Menu RID_POPUP_CHART
{
@@ -613,15 +613,15 @@ Menu RID_POPUP_CHART
MN_RENAME_OBJECT
//-#i68101#----------------------
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
MN_ARRANGESUB
MN_ALIGNSUB
MN_ANCHORSUB
- //------------------------------
+
MenuItem { Separator = TRUE ; };
- //------------------------------
+
ITEM_GROUP_MENU
MenuItem
{
@@ -632,9 +632,9 @@ Menu RID_POPUP_CHART
};
};
- //
+
// PopUpDraw Text
- //
+
String RID_POPUP_DRAWTEXT
{