Skip to content

C
core
Kaydet (Commit) ea18a9d3 authored tarafından Dieter Loeschky's avatar Dieter Loeschky
Dosyalara gözat
Seçenekler

Vertical writing

üst 4102e538
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 32 deletions
sd/inc/app.hrc
Dosyayı görüntüle @ ea18a9d3
......@@ -2,9 +2,9 @@
*
* $RCSfile: app.hrc,v $
*
* $Revision: 1.1.1.1 $
* $Revision: 1.2 $
*
* last change: $Author: hr $ $Date: 2000-09-18 16:48:27 $
* last change: $Author: dl $ $Date: 2001-02-05 11:32:26 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -350,7 +350,7 @@
#define SID_PUBLISH (SID_SD_START+283)
#define SID_PAGES_PER_ROW (SID_SD_START+284)
#define SID_TEXT_FITTOSIZE (SID_SD_START+285)
//#define SID_FLTWIN_SDOBJPALETTE (SID_SD_START+286)
#define SID_TEXT_FITTOSIZE_VERTICAL (SID_SD_START+286)
#define SID_NAVIGATOR_PAGENAME (SID_SD_START+287)
#define SID_NAVIGATOR_STATE (SID_SD_START+288)
#define SID_NAVIGATOR_INIT (SID_SD_START+289)
......
sd/sdi/_drvwsh.sdi
Dosyayı görüntüle @ ea18a9d3
......@@ -5,8 +5,8 @@
#* Beschreibung Basis fuer ViewShell-IDL
#*
#* Ersterstellung SOH 04.04.97
#* Letzte Aenderung $Author: dl $ $Date: 2001-01-24 13:21:02 $
#* $Revision: 1.2 $
#* Letzte Aenderung $Author: dl $ $Date: 2001-02-05 11:32:54 $
#* $Revision: 1.3 $
#*
#* $Logfile: T:/sd/sdi/_drvwsh.sdv $
#*
......@@ -16,7 +16,7 @@
Source Code Control System - Header
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sd/sdi/_drvwsh.sdi,v 1.2 2001-01-24 13:21:02 dl Exp $
$Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sd/sdi/_drvwsh.sdi,v 1.3 2001-02-05 11:32:54 dl Exp $
*************************************************************************/
// solange Nicht in svxslots.ilb
......@@ -611,6 +611,11 @@ interface DrawView : View
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
]
SID_ATTR_CHAR_VERTICAL // ole : no, status : ?
[
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
]
SID_TEXTEDIT // ole : no, status : ?
[
ExecMethod = FuPermanent ;
......@@ -621,6 +626,11 @@ interface DrawView : View
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
]
SID_TEXT_FITTOSIZE_VERTICAL // ole : no, status : ?
[
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
]
/* -> SVX
SID_OBJECT_ROTATE // ole : no, status : ?
[
......@@ -909,6 +919,11 @@ interface DrawView : View
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
]
SID_DRAW_CAPTION_VERTICAL // ole : no, status : no
[
ExecMethod = FuPermanent ;
StateMethod = GetMenuState ;
]
SID_DRAW_CIRCLE // ole : no, status : play rec
[
ExecMethod = FuPermanent ;
......@@ -2084,6 +2099,9 @@ interface DrawView : View
Source Code Control System - History
$Log: not supported by cvs2svn $
Revision 1.2 2001/01/24 13:21:02 dl
#78334# Enable SID_ATTR_TABSTOP
Revision 1.1.1.1 2000/09/18 16:48:29 hr
initial import
......
sd/source/ui/app/app.src
Dosyayı görüntüle @ ea18a9d3
......@@ -2,9 +2,9 @@
*
* $RCSfile: app.src,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: ka $ $Date: 2000-11-27 09:20:38 $
* last change: $Author: dl $ $Date: 2001-02-05 11:35:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -393,11 +393,15 @@
SID_INSERT_VIDEO;\
SID_OBJECT_TRANSPARENCE;\
SID_OBJECT_GRADIENT;\
SID_TEXT_FITTOSIZE_VERTICAL;\
SID_ATTR_CHAR_VERTICAL;\
SID_DRAW_CAPTION_VERTICAL;\
};\
IdCount = {\
283;\
286;\
};
ImageList RID_DEFAULTIMAGELIST_SC
{
ImageBitmap = Bitmap
......
sd/source/ui/app/tbx_ww.src
Dosyayı görüntüle @ ea18a9d3
......@@ -2,9 +2,9 @@
*
* $RCSfile: tbx_ww.src,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: kz $ $Date: 2000-12-08 18:13:09 $
* last change: $Author: dl $ $Date: 2001-02-05 11:35:37 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -333,6 +333,7 @@ FloatingWindow RID_TEXT
{
SVLook = TRUE ;
MenuStrings = TRUE ;
LineCount = 2 ;
ItemList =
{
ToolBoxItem
......@@ -352,6 +353,27 @@ FloatingWindow RID_TEXT
Identifier = SID_DRAW_CAPTION ;
HelpId = SID_DRAW_CAPTION ;
};
ToolBoxItem
{
Type = TOOLBOXITEM_BREAK ;
};
ToolBoxItem
{
RadioCheck = TRUE ;
Identifier = SID_ATTR_CHAR_VERTICAL ;
HelpID = SID_ATTR_CHAR_VERTICAL ;
};
ToolBoxItem
{
RadioCheck = TRUE ;
Identifier = SID_TEXT_FITTOSIZE_VERTICAL ;
HelpID = SID_TEXT_FITTOSIZE_VERTICAL ;
};
ToolBoxItem
{
Identifier = SID_DRAW_CAPTION_VERTICAL ;
HelpId = SID_DRAW_CAPTION_VERTICAL ;
};
};
};
Text [ dutch ] = "Tekst" ;
......
sd/source/ui/app/tbxww.cxx
Dosyayı görüntüle @ ea18a9d3
......@@ -2,9 +2,9 @@
*
* $RCSfile: tbxww.cxx,v $
*
* $Revision: 1.3 $
* $Revision: 1.4 $
*
* last change: $Author: ka $ $Date: 2000-11-24 18:53:23 $
* last change: $Author: dl $ $Date: 2001-02-05 11:33:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -384,8 +384,11 @@ BOOL SdTbxControl::IsCheckable( USHORT nSId )
case SID_CONVERT_TO_3D_LATHE:
case SID_ATTR_CHAR:
case SID_ATTR_CHAR_VERTICAL:
case SID_TEXT_FITTOSIZE:
case SID_TEXT_FITTOSIZE_VERTICAL:
case SID_DRAW_CAPTION:
case SID_DRAW_CAPTION_VERTICAL:
case SID_DRAW_RECT:
case SID_DRAW_SQUARE:
......
sd/source/ui/func/futext.cxx
Dosyayı görüntüle @ ea18a9d3
......@@ -2,9 +2,9 @@
*
* $RCSfile: futext.cxx,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: dl $ $Date: 2000-12-08 13:31:17 $
* last change: $Author: dl $ $Date: 2001-02-05 11:34:08 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -135,6 +135,11 @@
#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx>
#endif
#ifndef _OUTLOBJ_HXX
#include <svx/outlobj.hxx>
#endif
#include "sdresid.hxx"
#include "app.hrc"
#include "res_bmp.hrc"
......@@ -1004,6 +1009,14 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, BOOL bQuickDrag)
}
FASTBOOL bNewObj = TRUE;
OutlinerParaObject* pOPO = pTextObj->GetOutlinerParaObject();
if( ( pOPO && pOPO->IsVertical() ) ||
nSlotId == SID_ATTR_CHAR_VERTICAL ||
nSlotId == SID_TEXT_FITTOSIZE_VERTICAL )
pOutl->SetVertical( TRUE );
if (pView->BegTextEdit(pTextObj, pPV, pWindow, bNewObj, pOutl) &&
pTextObj->GetObjInventor() == SdrInventor)
{
......
sd/source/ui/view/drviews7.cxx
Dosyayı görüntüle @ ea18a9d3
......@@ -2,9 +2,9 @@
*
* $RCSfile: drviews7.cxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: dl $ $Date: 2000-12-14 15:53:22 $
* last change: $Author: dl $ $Date: 2001-02-05 11:34:36 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -907,8 +907,11 @@ void __EXPORT SdDrawViewShell::GetMenuState( SfxItemSet &rSet )
{
nCurrentSId = pFuActual->GetSlotID();
}
if( nCurrentSId != SID_TEXT_FITTOSIZE )
if( nCurrentSId != SID_TEXT_FITTOSIZE &&
nCurrentSId != SID_TEXT_FITTOSIZE_VERTICAL &&
nCurrentSId != SID_ATTR_CHAR_VERTICAL )
nCurrentSId = SID_ATTR_CHAR;
rSet.Put( SfxBoolItem( nCurrentSId, TRUE ) );
// Kurzform von UpdateToolboxImages()
......@@ -971,6 +974,8 @@ void __EXPORT SdDrawViewShell::GetMenuState( SfxItemSet &rSet )
// Alle objekterzeugenden Werkzeuge disablen
rSet.ClearItem( SID_ATTR_CHAR );
rSet.DisableItem( SID_ATTR_CHAR );
rSet.ClearItem( SID_ATTR_CHAR_VERTICAL );
rSet.DisableItem( SID_ATTR_CHAR_VERTICAL );
rSet.ClearItem(SID_DRAW_LINE);
rSet.DisableItem(SID_DRAW_LINE);
rSet.ClearItem(SID_DRAW_MEASURELINE);
......@@ -1018,8 +1023,12 @@ void __EXPORT SdDrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem(SID_DRAW_CIRCLE_NOFILL);
rSet.ClearItem(SID_DRAW_CAPTION);
rSet.DisableItem(SID_DRAW_CAPTION);
rSet.ClearItem(SID_DRAW_CAPTION_VERTICAL);
rSet.DisableItem(SID_DRAW_CAPTION_VERTICAL);
rSet.ClearItem(SID_TEXT_FITTOSIZE);
rSet.DisableItem(SID_TEXT_FITTOSIZE);
rSet.ClearItem(SID_TEXT_FITTOSIZE_VERTICAL);
rSet.DisableItem(SID_TEXT_FITTOSIZE_VERTICAL);
rSet.ClearItem(SID_TOOL_CONNECTOR);
rSet.DisableItem(SID_TOOL_CONNECTOR);
rSet.ClearItem(SID_CONNECTOR_ARROW_START);
......
sd/source/ui/view/drviewsc.cxx
Dosyayı görüntüle @ ea18a9d3
......@@ -2,9 +2,9 @@
*
* $RCSfile: drviewsc.cxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: dl $ $Date: 2001-01-25 14:37:07 $
* last change: $Author: dl $ $Date: 2001-02-05 11:34:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -756,8 +756,11 @@ USHORT SdDrawViewShell::GetIdBySubId( USHORT nSId )
break;
case SID_ATTR_CHAR:
case SID_ATTR_CHAR_VERTICAL:
case SID_TEXT_FITTOSIZE:
case SID_TEXT_FITTOSIZE_VERTICAL:
case SID_DRAW_CAPTION:
case SID_DRAW_CAPTION_VERTICAL:
{
nMappedSId = SID_DRAWTBX_TEXT;
}
......
sd/source/ui/view/drviewse.cxx
Dosyayı görüntüle @ ea18a9d3
......@@ -2,9 +2,9 @@
*
* $RCSfile: drviewse.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: dl $ $Date: 2001-01-26 14:25:33 $
* last change: $Author: dl $ $Date: 2001-02-05 11:35:03 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -188,8 +188,8 @@ void SdDrawViewShell::FuPermanent(SfxRequest& rReq)
USHORT nSId = rReq.GetSlot();
if( pFuActual && pFuActual->ISA(FuText) &&
( nSId == SID_TEXTEDIT || nSId == SID_ATTR_CHAR ||
nSId == SID_TEXT_FITTOSIZE ) )
( nSId == SID_TEXTEDIT || nSId == SID_ATTR_CHAR || nSId == SID_TEXT_FITTOSIZE ||
nSId == SID_ATTR_CHAR_VERTICAL || nSId == SID_TEXT_FITTOSIZE_VERTICAL ) )
{
((FuText*) pFuActual)->SetPermanent(TRUE);
pFuActual->ReceiveRequest( rReq );
......@@ -212,8 +212,8 @@ void SdDrawViewShell::FuPermanent(SfxRequest& rReq)
pFuOld = NULL;
}
if ( nSId != SID_TEXTEDIT && nSId != SID_ATTR_CHAR &&
nSId != SID_TEXT_FITTOSIZE &&
if ( nSId != SID_TEXTEDIT && nSId != SID_ATTR_CHAR && nSId != SID_TEXT_FITTOSIZE &&
nSId != SID_ATTR_CHAR_VERTICAL && nSId != SID_TEXT_FITTOSIZE_VERTICAL &&
pDrView->IsTextEdit() )
{
pDrView->EndTextEdit();
......@@ -222,8 +222,10 @@ void SdDrawViewShell::FuPermanent(SfxRequest& rReq)
nOldSId = pFuActual->GetSlotID();
if (nOldSId == nSId ||
((nOldSId == SID_TEXTEDIT || nOldSId == SID_ATTR_CHAR || nOldSId == SID_TEXT_FITTOSIZE) &&
(nSId == SID_TEXTEDIT || nSId == SID_ATTR_CHAR || nSId == SID_TEXT_FITTOSIZE)))
((nOldSId == SID_TEXTEDIT || nOldSId == SID_ATTR_CHAR || nOldSId == SID_TEXT_FITTOSIZE ||
nOldSId == SID_ATTR_CHAR_VERTICAL || nOldSId == SID_TEXT_FITTOSIZE_VERTICAL) &&
(nSId == SID_TEXTEDIT || nSId == SID_ATTR_CHAR || nSId == SID_TEXT_FITTOSIZE ||
nSId == SID_ATTR_CHAR_VERTICAL || nSId == SID_TEXT_FITTOSIZE_VERTICAL )))
{
bPermanent = TRUE;
}
......@@ -244,19 +246,19 @@ void SdDrawViewShell::FuPermanent(SfxRequest& rReq)
{
case SID_TEXTEDIT: // BASIC ???
case SID_ATTR_CHAR:
case SID_ATTR_CHAR_VERTICAL:
case SID_TEXT_FITTOSIZE:
case SID_TEXT_FITTOSIZE_VERTICAL:
{
USHORT n1 = SID_TEXTEDIT;
USHORT n2 = SID_ATTR_CHAR;
USHORT n3 = SID_TEXT_FITTOSIZE;
pFuActual = new FuText(this, pWindow, pDrView, pDoc, rReq);
( (FuText*) pFuActual)->DoExecute();
// Das Setzen des Permanent-Status erfolgt weiter oben!
SfxBindings& rBindings = GetViewFrame()->GetBindings();
rBindings.Invalidate( SID_ATTR_CHAR );
rBindings.Invalidate( SID_ATTR_CHAR_VERTICAL );
rBindings.Invalidate( SID_TEXT_FITTOSIZE );
rBindings.Invalidate( SID_TEXT_FITTOSIZE_VERTICAL );
rReq.Done();
}
break;
......@@ -372,6 +374,7 @@ void SdDrawViewShell::FuPermanent(SfxRequest& rReq)
case SID_DRAW_CIRCLE:
case SID_DRAW_CIRCLE_NOFILL:
case SID_DRAW_CAPTION:
case SID_DRAW_CAPTION_VERTICAL:
case SID_TOOL_CONNECTOR:
case SID_CONNECTOR_ARROW_START:
case SID_CONNECTOR_ARROW_END:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment