INTEGRATION: CWS sdwarningsbegone (1.12.316); FILE MERGED
2006/11/22 12:42:04 cl 1.12.316.1: #i69285# warning free code changes for unxlngi6.pro
This commit is contained in:
parent
728fa5298b
commit
ee59bc8ab0
1 changed files with 19 additions and 19 deletions
|
@ -4,9 +4,9 @@
|
||||||
*
|
*
|
||||||
* $RCSfile: navigatr.hxx,v $
|
* $RCSfile: navigatr.hxx,v $
|
||||||
*
|
*
|
||||||
* $Revision: 1.12 $
|
* $Revision: 1.13 $
|
||||||
*
|
*
|
||||||
* last change: $Author: rt $ $Date: 2005-09-09 05:46:15 $
|
* last change: $Author: kz $ $Date: 2006-12-12 17:44:36 $
|
||||||
*
|
*
|
||||||
* The Contents of this file are made available subject to
|
* The Contents of this file are made available subject to
|
||||||
* the terms of GNU Lesser General Public License Version 2.1.
|
* the terms of GNU Lesser General Public License Version 2.1.
|
||||||
|
@ -89,7 +89,7 @@ class SdPageNameControllerItem;
|
||||||
class NavDocInfo
|
class NavDocInfo
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
NavDocInfo() { pDocShell = NULL; }
|
NavDocInfo() { mpDocShell = NULL; }
|
||||||
|
|
||||||
BOOL HasName() { return( (BOOL) bName ); }
|
BOOL HasName() { return( (BOOL) bName ); }
|
||||||
BOOL IsActive() { return( (BOOL) bActive ); }
|
BOOL IsActive() { return( (BOOL) bActive ); }
|
||||||
|
@ -101,7 +101,7 @@ private:
|
||||||
friend class SdNavigatorWin;
|
friend class SdNavigatorWin;
|
||||||
BOOL bName : 1;
|
BOOL bName : 1;
|
||||||
BOOL bActive : 1;
|
BOOL bActive : 1;
|
||||||
::sd::DrawDocShell* pDocShell;
|
::sd::DrawDocShell* mpDocShell;
|
||||||
};
|
};
|
||||||
|
|
||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
|
@ -125,7 +125,7 @@ public:
|
||||||
BOOL InsertFile(const String& rFileName);
|
BOOL InsertFile(const String& rFileName);
|
||||||
|
|
||||||
NavigatorDragType GetNavigatorDragType();
|
NavigatorDragType GetNavigatorDragType();
|
||||||
void SetNavigatorDragType(NavigatorDragType eType) { eDragType = eType; }
|
void SetNavigatorDragType(NavigatorDragType eType) { meDragType = eType; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void Resize();
|
virtual void Resize();
|
||||||
|
@ -137,21 +137,21 @@ private:
|
||||||
friend class SdNavigatorControllerItem;
|
friend class SdNavigatorControllerItem;
|
||||||
friend class SdPageNameControllerItem;
|
friend class SdPageNameControllerItem;
|
||||||
|
|
||||||
ToolBox aToolbox;
|
ToolBox maToolbox;
|
||||||
SdPageObjsTLB aTlbObjects;
|
SdPageObjsTLB maTlbObjects;
|
||||||
ListBox aLbDocs;
|
ListBox maLbDocs;
|
||||||
|
|
||||||
::sd::NavigatorChildWindow* pChildWinContext;
|
::sd::NavigatorChildWindow* mpChildWinContext;
|
||||||
Size aSize;
|
Size maSize;
|
||||||
Size aMinSize;
|
Size maMinSize;
|
||||||
Size aFltWinSize;
|
// Size maFltWinSize;
|
||||||
BOOL bDocImported;
|
BOOL mbDocImported;
|
||||||
String aDropFileName;
|
String maDropFileName;
|
||||||
NavigatorDragType eDragType;
|
NavigatorDragType meDragType;
|
||||||
List* pDocList;
|
List* mpDocList;
|
||||||
SfxBindings* pBindings;
|
SfxBindings* mpBindings;
|
||||||
SdNavigatorControllerItem* pNavigatorCtrlItem;
|
SdNavigatorControllerItem* mpNavigatorCtrlItem;
|
||||||
SdPageNameControllerItem* pPageNameCtrlItem;
|
SdPageNameControllerItem* mpPageNameCtrlItem;
|
||||||
|
|
||||||
ImageList maImageList;
|
ImageList maImageList;
|
||||||
ImageList maImageListH;
|
ImageList maImageListH;
|
||||||
|
|
Loading…
Reference in a new issue