diff options
author | Mathias Bauer <mba@openoffice.org> | 2010-04-17 20:34:49 +0200 |
---|---|---|
committer | Mathias Bauer <mba@openoffice.org> | 2010-04-17 20:34:49 +0200 |
commit | 65bff6225b635f2b5fb75b648bf46ea54d2d7843 (patch) | |
tree | 01fd07efafdb9cd5eed1da9103725313e0b67e9e /sfx2/source/statbar | |
parent | 692dac6c6e964a64909f9adfba44f936810c2646 (diff) | |
parent | a001605a190749900d3e09aa864ce56925ff848e (diff) |
CWS gnumake2: rebase to DEV300_m76; fix build problems
Diffstat (limited to 'sfx2/source/statbar')
-rw-r--r-- | sfx2/source/statbar/makefile.mk | 6 | ||||
-rw-r--r-- | sfx2/source/statbar/stbitem.cxx | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sfx2/source/statbar/makefile.mk b/sfx2/source/statbar/makefile.mk index b5c4f1f5fbaf..f99c8fcdaa1e 100644 --- a/sfx2/source/statbar/makefile.mk +++ b/sfx2/source/statbar/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.10 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index df463ac92396..dc5ad5f15d41 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: stbitem.cxx,v $ - * $Revision: 1.16 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -44,7 +41,7 @@ #include <vcl/status.hxx> #include <sfx2/app.hxx> -#include "stbitem.hxx" +#include "sfx2/stbitem.hxx" #include "sfxtypes.hxx" #include <sfx2/msg.hxx> #include "arrdecl.hxx" |